diff --git a/src/frontends/android/.classpath b/src/frontends/android/.classpath
deleted file mode 100644
index 51769745b..000000000
--- a/src/frontends/android/.classpath
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/src/frontends/android/.gitignore b/src/frontends/android/.gitignore
index a031dba58..7e4bcfd4e 100644
--- a/src/frontends/android/.gitignore
+++ b/src/frontends/android/.gitignore
@@ -1,4 +1,7 @@
-bin/
-gen/
-libs/
-obj/
+.gradle/
+.idea/
+app/build/
+app/src/main/libs
+app/src/main/obj
+*.iml
+local.properties
diff --git a/src/frontends/android/README.ndk b/src/frontends/android/README.ndk
index 699fa3f11..7c8cd309e 100644
--- a/src/frontends/android/README.ndk
+++ b/src/frontends/android/README.ndk
@@ -1,5 +1,5 @@
-To build this within the NDK several things have to be added in the jni
-folder:
+To build this within the NDK several things have to be added in the
+app/src/main/jni/ folder:
- strongswan: The strongSwan sources. This can either be an extracted tarball,
or a symlink to the Git repository. To build from the repository the sources
diff --git a/src/frontends/android/app/build.gradle b/src/frontends/android/app/build.gradle
new file mode 100644
index 000000000..8280f501f
--- /dev/null
+++ b/src/frontends/android/app/build.gradle
@@ -0,0 +1,42 @@
+apply plugin: 'com.android.application'
+
+android {
+ compileSdkVersion 21
+ buildToolsVersion "22.0.1"
+
+ defaultConfig {
+ applicationId "org.strongswan.android"
+ minSdkVersion 15
+ targetSdkVersion 22
+ versionCode 28
+ versionName "1.5.0"
+ }
+
+ sourceSets.main {
+ jni.srcDirs = [] // disables the default ndk-build call (with on-the-fly Android.mk files)
+ jniLibs.srcDir 'src/main/libs'
+ }
+
+ task buildNative(type: Exec) {
+ workingDir 'src/main/jni'
+ commandLine "${android.ndkDirectory}/ndk-build", '-j', Runtime.runtime.availableProcessors()
+ }
+
+ task cleanNative(type: Exec) {
+ workingDir 'src/main/jni'
+ commandLine "${android.ndkDirectory}/ndk-build", 'clean'
+ }
+
+ tasks.withType(JavaCompile) {
+ compileTask -> compileTask.dependsOn buildNative
+ }
+
+ clean.dependsOn 'cleanNative'
+
+ buildTypes {
+ release {
+ minifyEnabled false
+ proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
+ }
+ }
+}
diff --git a/src/frontends/android/AndroidManifest.xml b/src/frontends/android/app/src/main/AndroidManifest.xml
similarity index 96%
rename from src/frontends/android/AndroidManifest.xml
rename to src/frontends/android/app/src/main/AndroidManifest.xml
index 65a8275de..2ab833cdb 100644
--- a/src/frontends/android/AndroidManifest.xml
+++ b/src/frontends/android/app/src/main/AndroidManifest.xml
@@ -16,11 +16,7 @@
for more details.
-->
-
-
+ package="org.strongswan.android">
diff --git a/src/frontends/android/src/org/strongswan/android/data/LogContentProvider.java b/src/frontends/android/app/src/main/java/org/strongswan/android/data/LogContentProvider.java
similarity index 100%
rename from src/frontends/android/src/org/strongswan/android/data/LogContentProvider.java
rename to src/frontends/android/app/src/main/java/org/strongswan/android/data/LogContentProvider.java
diff --git a/src/frontends/android/src/org/strongswan/android/data/VpnProfile.java b/src/frontends/android/app/src/main/java/org/strongswan/android/data/VpnProfile.java
similarity index 100%
rename from src/frontends/android/src/org/strongswan/android/data/VpnProfile.java
rename to src/frontends/android/app/src/main/java/org/strongswan/android/data/VpnProfile.java
diff --git a/src/frontends/android/src/org/strongswan/android/data/VpnProfileDataSource.java b/src/frontends/android/app/src/main/java/org/strongswan/android/data/VpnProfileDataSource.java
similarity index 100%
rename from src/frontends/android/src/org/strongswan/android/data/VpnProfileDataSource.java
rename to src/frontends/android/app/src/main/java/org/strongswan/android/data/VpnProfileDataSource.java
diff --git a/src/frontends/android/src/org/strongswan/android/data/VpnType.java b/src/frontends/android/app/src/main/java/org/strongswan/android/data/VpnType.java
similarity index 100%
rename from src/frontends/android/src/org/strongswan/android/data/VpnType.java
rename to src/frontends/android/app/src/main/java/org/strongswan/android/data/VpnType.java
diff --git a/src/frontends/android/src/org/strongswan/android/logic/CharonVpnService.java b/src/frontends/android/app/src/main/java/org/strongswan/android/logic/CharonVpnService.java
similarity index 100%
rename from src/frontends/android/src/org/strongswan/android/logic/CharonVpnService.java
rename to src/frontends/android/app/src/main/java/org/strongswan/android/logic/CharonVpnService.java
diff --git a/src/frontends/android/src/org/strongswan/android/logic/NetworkManager.java b/src/frontends/android/app/src/main/java/org/strongswan/android/logic/NetworkManager.java
similarity index 100%
rename from src/frontends/android/src/org/strongswan/android/logic/NetworkManager.java
rename to src/frontends/android/app/src/main/java/org/strongswan/android/logic/NetworkManager.java
diff --git a/src/frontends/android/src/org/strongswan/android/logic/StrongSwanApplication.java b/src/frontends/android/app/src/main/java/org/strongswan/android/logic/StrongSwanApplication.java
similarity index 100%
rename from src/frontends/android/src/org/strongswan/android/logic/StrongSwanApplication.java
rename to src/frontends/android/app/src/main/java/org/strongswan/android/logic/StrongSwanApplication.java
diff --git a/src/frontends/android/src/org/strongswan/android/logic/TrustedCertificateManager.java b/src/frontends/android/app/src/main/java/org/strongswan/android/logic/TrustedCertificateManager.java
similarity index 100%
rename from src/frontends/android/src/org/strongswan/android/logic/TrustedCertificateManager.java
rename to src/frontends/android/app/src/main/java/org/strongswan/android/logic/TrustedCertificateManager.java
diff --git a/src/frontends/android/src/org/strongswan/android/logic/VpnStateService.java b/src/frontends/android/app/src/main/java/org/strongswan/android/logic/VpnStateService.java
similarity index 100%
rename from src/frontends/android/src/org/strongswan/android/logic/VpnStateService.java
rename to src/frontends/android/app/src/main/java/org/strongswan/android/logic/VpnStateService.java
diff --git a/src/frontends/android/src/org/strongswan/android/logic/imc/AndroidImc.java b/src/frontends/android/app/src/main/java/org/strongswan/android/logic/imc/AndroidImc.java
similarity index 100%
rename from src/frontends/android/src/org/strongswan/android/logic/imc/AndroidImc.java
rename to src/frontends/android/app/src/main/java/org/strongswan/android/logic/imc/AndroidImc.java
diff --git a/src/frontends/android/src/org/strongswan/android/logic/imc/ImcState.java b/src/frontends/android/app/src/main/java/org/strongswan/android/logic/imc/ImcState.java
similarity index 100%
rename from src/frontends/android/src/org/strongswan/android/logic/imc/ImcState.java
rename to src/frontends/android/app/src/main/java/org/strongswan/android/logic/imc/ImcState.java
diff --git a/src/frontends/android/src/org/strongswan/android/logic/imc/RemediationInstruction.java b/src/frontends/android/app/src/main/java/org/strongswan/android/logic/imc/RemediationInstruction.java
similarity index 100%
rename from src/frontends/android/src/org/strongswan/android/logic/imc/RemediationInstruction.java
rename to src/frontends/android/app/src/main/java/org/strongswan/android/logic/imc/RemediationInstruction.java
diff --git a/src/frontends/android/src/org/strongswan/android/logic/imc/attributes/Attribute.java b/src/frontends/android/app/src/main/java/org/strongswan/android/logic/imc/attributes/Attribute.java
similarity index 100%
rename from src/frontends/android/src/org/strongswan/android/logic/imc/attributes/Attribute.java
rename to src/frontends/android/app/src/main/java/org/strongswan/android/logic/imc/attributes/Attribute.java
diff --git a/src/frontends/android/src/org/strongswan/android/logic/imc/attributes/AttributeType.java b/src/frontends/android/app/src/main/java/org/strongswan/android/logic/imc/attributes/AttributeType.java
similarity index 100%
rename from src/frontends/android/src/org/strongswan/android/logic/imc/attributes/AttributeType.java
rename to src/frontends/android/app/src/main/java/org/strongswan/android/logic/imc/attributes/AttributeType.java
diff --git a/src/frontends/android/src/org/strongswan/android/logic/imc/attributes/DeviceIdAttribute.java b/src/frontends/android/app/src/main/java/org/strongswan/android/logic/imc/attributes/DeviceIdAttribute.java
similarity index 100%
rename from src/frontends/android/src/org/strongswan/android/logic/imc/attributes/DeviceIdAttribute.java
rename to src/frontends/android/app/src/main/java/org/strongswan/android/logic/imc/attributes/DeviceIdAttribute.java
diff --git a/src/frontends/android/src/org/strongswan/android/logic/imc/attributes/InstalledPackagesAttribute.java b/src/frontends/android/app/src/main/java/org/strongswan/android/logic/imc/attributes/InstalledPackagesAttribute.java
similarity index 100%
rename from src/frontends/android/src/org/strongswan/android/logic/imc/attributes/InstalledPackagesAttribute.java
rename to src/frontends/android/app/src/main/java/org/strongswan/android/logic/imc/attributes/InstalledPackagesAttribute.java
diff --git a/src/frontends/android/src/org/strongswan/android/logic/imc/attributes/PortFilterAttribute.java b/src/frontends/android/app/src/main/java/org/strongswan/android/logic/imc/attributes/PortFilterAttribute.java
similarity index 100%
rename from src/frontends/android/src/org/strongswan/android/logic/imc/attributes/PortFilterAttribute.java
rename to src/frontends/android/app/src/main/java/org/strongswan/android/logic/imc/attributes/PortFilterAttribute.java
diff --git a/src/frontends/android/src/org/strongswan/android/logic/imc/attributes/PrivateEnterpriseNumber.java b/src/frontends/android/app/src/main/java/org/strongswan/android/logic/imc/attributes/PrivateEnterpriseNumber.java
similarity index 100%
rename from src/frontends/android/src/org/strongswan/android/logic/imc/attributes/PrivateEnterpriseNumber.java
rename to src/frontends/android/app/src/main/java/org/strongswan/android/logic/imc/attributes/PrivateEnterpriseNumber.java
diff --git a/src/frontends/android/src/org/strongswan/android/logic/imc/attributes/ProductInformationAttribute.java b/src/frontends/android/app/src/main/java/org/strongswan/android/logic/imc/attributes/ProductInformationAttribute.java
similarity index 100%
rename from src/frontends/android/src/org/strongswan/android/logic/imc/attributes/ProductInformationAttribute.java
rename to src/frontends/android/app/src/main/java/org/strongswan/android/logic/imc/attributes/ProductInformationAttribute.java
diff --git a/src/frontends/android/src/org/strongswan/android/logic/imc/attributes/SettingsAttribute.java b/src/frontends/android/app/src/main/java/org/strongswan/android/logic/imc/attributes/SettingsAttribute.java
similarity index 100%
rename from src/frontends/android/src/org/strongswan/android/logic/imc/attributes/SettingsAttribute.java
rename to src/frontends/android/app/src/main/java/org/strongswan/android/logic/imc/attributes/SettingsAttribute.java
diff --git a/src/frontends/android/src/org/strongswan/android/logic/imc/attributes/StringVersionAttribute.java b/src/frontends/android/app/src/main/java/org/strongswan/android/logic/imc/attributes/StringVersionAttribute.java
similarity index 100%
rename from src/frontends/android/src/org/strongswan/android/logic/imc/attributes/StringVersionAttribute.java
rename to src/frontends/android/app/src/main/java/org/strongswan/android/logic/imc/attributes/StringVersionAttribute.java
diff --git a/src/frontends/android/src/org/strongswan/android/logic/imc/collectors/Collector.java b/src/frontends/android/app/src/main/java/org/strongswan/android/logic/imc/collectors/Collector.java
similarity index 100%
rename from src/frontends/android/src/org/strongswan/android/logic/imc/collectors/Collector.java
rename to src/frontends/android/app/src/main/java/org/strongswan/android/logic/imc/collectors/Collector.java
diff --git a/src/frontends/android/src/org/strongswan/android/logic/imc/collectors/DeviceIdCollector.java b/src/frontends/android/app/src/main/java/org/strongswan/android/logic/imc/collectors/DeviceIdCollector.java
similarity index 100%
rename from src/frontends/android/src/org/strongswan/android/logic/imc/collectors/DeviceIdCollector.java
rename to src/frontends/android/app/src/main/java/org/strongswan/android/logic/imc/collectors/DeviceIdCollector.java
diff --git a/src/frontends/android/src/org/strongswan/android/logic/imc/collectors/InstalledPackagesCollector.java b/src/frontends/android/app/src/main/java/org/strongswan/android/logic/imc/collectors/InstalledPackagesCollector.java
similarity index 100%
rename from src/frontends/android/src/org/strongswan/android/logic/imc/collectors/InstalledPackagesCollector.java
rename to src/frontends/android/app/src/main/java/org/strongswan/android/logic/imc/collectors/InstalledPackagesCollector.java
diff --git a/src/frontends/android/src/org/strongswan/android/logic/imc/collectors/PortFilterCollector.java b/src/frontends/android/app/src/main/java/org/strongswan/android/logic/imc/collectors/PortFilterCollector.java
similarity index 100%
rename from src/frontends/android/src/org/strongswan/android/logic/imc/collectors/PortFilterCollector.java
rename to src/frontends/android/app/src/main/java/org/strongswan/android/logic/imc/collectors/PortFilterCollector.java
diff --git a/src/frontends/android/src/org/strongswan/android/logic/imc/collectors/ProductInformationCollector.java b/src/frontends/android/app/src/main/java/org/strongswan/android/logic/imc/collectors/ProductInformationCollector.java
similarity index 100%
rename from src/frontends/android/src/org/strongswan/android/logic/imc/collectors/ProductInformationCollector.java
rename to src/frontends/android/app/src/main/java/org/strongswan/android/logic/imc/collectors/ProductInformationCollector.java
diff --git a/src/frontends/android/src/org/strongswan/android/logic/imc/collectors/Protocol.java b/src/frontends/android/app/src/main/java/org/strongswan/android/logic/imc/collectors/Protocol.java
similarity index 100%
rename from src/frontends/android/src/org/strongswan/android/logic/imc/collectors/Protocol.java
rename to src/frontends/android/app/src/main/java/org/strongswan/android/logic/imc/collectors/Protocol.java
diff --git a/src/frontends/android/src/org/strongswan/android/logic/imc/collectors/SettingsCollector.java b/src/frontends/android/app/src/main/java/org/strongswan/android/logic/imc/collectors/SettingsCollector.java
similarity index 100%
rename from src/frontends/android/src/org/strongswan/android/logic/imc/collectors/SettingsCollector.java
rename to src/frontends/android/app/src/main/java/org/strongswan/android/logic/imc/collectors/SettingsCollector.java
diff --git a/src/frontends/android/src/org/strongswan/android/logic/imc/collectors/StringVersionCollector.java b/src/frontends/android/app/src/main/java/org/strongswan/android/logic/imc/collectors/StringVersionCollector.java
similarity index 100%
rename from src/frontends/android/src/org/strongswan/android/logic/imc/collectors/StringVersionCollector.java
rename to src/frontends/android/app/src/main/java/org/strongswan/android/logic/imc/collectors/StringVersionCollector.java
diff --git a/src/frontends/android/src/org/strongswan/android/security/LocalCertificateKeyStoreProvider.java b/src/frontends/android/app/src/main/java/org/strongswan/android/security/LocalCertificateKeyStoreProvider.java
similarity index 100%
rename from src/frontends/android/src/org/strongswan/android/security/LocalCertificateKeyStoreProvider.java
rename to src/frontends/android/app/src/main/java/org/strongswan/android/security/LocalCertificateKeyStoreProvider.java
diff --git a/src/frontends/android/src/org/strongswan/android/security/LocalCertificateKeyStoreSpi.java b/src/frontends/android/app/src/main/java/org/strongswan/android/security/LocalCertificateKeyStoreSpi.java
similarity index 100%
rename from src/frontends/android/src/org/strongswan/android/security/LocalCertificateKeyStoreSpi.java
rename to src/frontends/android/app/src/main/java/org/strongswan/android/security/LocalCertificateKeyStoreSpi.java
diff --git a/src/frontends/android/src/org/strongswan/android/security/LocalCertificateStore.java b/src/frontends/android/app/src/main/java/org/strongswan/android/security/LocalCertificateStore.java
similarity index 100%
rename from src/frontends/android/src/org/strongswan/android/security/LocalCertificateStore.java
rename to src/frontends/android/app/src/main/java/org/strongswan/android/security/LocalCertificateStore.java
diff --git a/src/frontends/android/src/org/strongswan/android/security/TrustedCertificateEntry.java b/src/frontends/android/app/src/main/java/org/strongswan/android/security/TrustedCertificateEntry.java
similarity index 100%
rename from src/frontends/android/src/org/strongswan/android/security/TrustedCertificateEntry.java
rename to src/frontends/android/app/src/main/java/org/strongswan/android/security/TrustedCertificateEntry.java
diff --git a/src/frontends/android/src/org/strongswan/android/ui/CertificateDeleteConfirmationDialog.java b/src/frontends/android/app/src/main/java/org/strongswan/android/ui/CertificateDeleteConfirmationDialog.java
similarity index 100%
rename from src/frontends/android/src/org/strongswan/android/ui/CertificateDeleteConfirmationDialog.java
rename to src/frontends/android/app/src/main/java/org/strongswan/android/ui/CertificateDeleteConfirmationDialog.java
diff --git a/src/frontends/android/src/org/strongswan/android/ui/ImcStateFragment.java b/src/frontends/android/app/src/main/java/org/strongswan/android/ui/ImcStateFragment.java
similarity index 100%
rename from src/frontends/android/src/org/strongswan/android/ui/ImcStateFragment.java
rename to src/frontends/android/app/src/main/java/org/strongswan/android/ui/ImcStateFragment.java
diff --git a/src/frontends/android/src/org/strongswan/android/ui/LogActivity.java b/src/frontends/android/app/src/main/java/org/strongswan/android/ui/LogActivity.java
similarity index 100%
rename from src/frontends/android/src/org/strongswan/android/ui/LogActivity.java
rename to src/frontends/android/app/src/main/java/org/strongswan/android/ui/LogActivity.java
diff --git a/src/frontends/android/src/org/strongswan/android/ui/LogFragment.java b/src/frontends/android/app/src/main/java/org/strongswan/android/ui/LogFragment.java
similarity index 100%
rename from src/frontends/android/src/org/strongswan/android/ui/LogFragment.java
rename to src/frontends/android/app/src/main/java/org/strongswan/android/ui/LogFragment.java
diff --git a/src/frontends/android/src/org/strongswan/android/ui/LogScrollView.java b/src/frontends/android/app/src/main/java/org/strongswan/android/ui/LogScrollView.java
similarity index 100%
rename from src/frontends/android/src/org/strongswan/android/ui/LogScrollView.java
rename to src/frontends/android/app/src/main/java/org/strongswan/android/ui/LogScrollView.java
diff --git a/src/frontends/android/src/org/strongswan/android/ui/MainActivity.java b/src/frontends/android/app/src/main/java/org/strongswan/android/ui/MainActivity.java
similarity index 100%
rename from src/frontends/android/src/org/strongswan/android/ui/MainActivity.java
rename to src/frontends/android/app/src/main/java/org/strongswan/android/ui/MainActivity.java
diff --git a/src/frontends/android/src/org/strongswan/android/ui/RemediationInstructionFragment.java b/src/frontends/android/app/src/main/java/org/strongswan/android/ui/RemediationInstructionFragment.java
similarity index 100%
rename from src/frontends/android/src/org/strongswan/android/ui/RemediationInstructionFragment.java
rename to src/frontends/android/app/src/main/java/org/strongswan/android/ui/RemediationInstructionFragment.java
diff --git a/src/frontends/android/src/org/strongswan/android/ui/RemediationInstructionsActivity.java b/src/frontends/android/app/src/main/java/org/strongswan/android/ui/RemediationInstructionsActivity.java
similarity index 100%
rename from src/frontends/android/src/org/strongswan/android/ui/RemediationInstructionsActivity.java
rename to src/frontends/android/app/src/main/java/org/strongswan/android/ui/RemediationInstructionsActivity.java
diff --git a/src/frontends/android/src/org/strongswan/android/ui/RemediationInstructionsFragment.java b/src/frontends/android/app/src/main/java/org/strongswan/android/ui/RemediationInstructionsFragment.java
similarity index 100%
rename from src/frontends/android/src/org/strongswan/android/ui/RemediationInstructionsFragment.java
rename to src/frontends/android/app/src/main/java/org/strongswan/android/ui/RemediationInstructionsFragment.java
diff --git a/src/frontends/android/src/org/strongswan/android/ui/TrustedCertificateImportActivity.java b/src/frontends/android/app/src/main/java/org/strongswan/android/ui/TrustedCertificateImportActivity.java
similarity index 100%
rename from src/frontends/android/src/org/strongswan/android/ui/TrustedCertificateImportActivity.java
rename to src/frontends/android/app/src/main/java/org/strongswan/android/ui/TrustedCertificateImportActivity.java
diff --git a/src/frontends/android/src/org/strongswan/android/ui/TrustedCertificateListFragment.java b/src/frontends/android/app/src/main/java/org/strongswan/android/ui/TrustedCertificateListFragment.java
similarity index 100%
rename from src/frontends/android/src/org/strongswan/android/ui/TrustedCertificateListFragment.java
rename to src/frontends/android/app/src/main/java/org/strongswan/android/ui/TrustedCertificateListFragment.java
diff --git a/src/frontends/android/src/org/strongswan/android/ui/TrustedCertificatesActivity.java b/src/frontends/android/app/src/main/java/org/strongswan/android/ui/TrustedCertificatesActivity.java
similarity index 100%
rename from src/frontends/android/src/org/strongswan/android/ui/TrustedCertificatesActivity.java
rename to src/frontends/android/app/src/main/java/org/strongswan/android/ui/TrustedCertificatesActivity.java
diff --git a/src/frontends/android/src/org/strongswan/android/ui/VpnProfileDetailActivity.java b/src/frontends/android/app/src/main/java/org/strongswan/android/ui/VpnProfileDetailActivity.java
similarity index 100%
rename from src/frontends/android/src/org/strongswan/android/ui/VpnProfileDetailActivity.java
rename to src/frontends/android/app/src/main/java/org/strongswan/android/ui/VpnProfileDetailActivity.java
diff --git a/src/frontends/android/src/org/strongswan/android/ui/VpnProfileListFragment.java b/src/frontends/android/app/src/main/java/org/strongswan/android/ui/VpnProfileListFragment.java
similarity index 100%
rename from src/frontends/android/src/org/strongswan/android/ui/VpnProfileListFragment.java
rename to src/frontends/android/app/src/main/java/org/strongswan/android/ui/VpnProfileListFragment.java
diff --git a/src/frontends/android/src/org/strongswan/android/ui/VpnProfileSelectActivity.java b/src/frontends/android/app/src/main/java/org/strongswan/android/ui/VpnProfileSelectActivity.java
similarity index 100%
rename from src/frontends/android/src/org/strongswan/android/ui/VpnProfileSelectActivity.java
rename to src/frontends/android/app/src/main/java/org/strongswan/android/ui/VpnProfileSelectActivity.java
diff --git a/src/frontends/android/src/org/strongswan/android/ui/VpnStateFragment.java b/src/frontends/android/app/src/main/java/org/strongswan/android/ui/VpnStateFragment.java
similarity index 100%
rename from src/frontends/android/src/org/strongswan/android/ui/VpnStateFragment.java
rename to src/frontends/android/app/src/main/java/org/strongswan/android/ui/VpnStateFragment.java
diff --git a/src/frontends/android/src/org/strongswan/android/ui/adapter/RemediationInstructionAdapter.java b/src/frontends/android/app/src/main/java/org/strongswan/android/ui/adapter/RemediationInstructionAdapter.java
similarity index 100%
rename from src/frontends/android/src/org/strongswan/android/ui/adapter/RemediationInstructionAdapter.java
rename to src/frontends/android/app/src/main/java/org/strongswan/android/ui/adapter/RemediationInstructionAdapter.java
diff --git a/src/frontends/android/src/org/strongswan/android/ui/adapter/TrustedCertificateAdapter.java b/src/frontends/android/app/src/main/java/org/strongswan/android/ui/adapter/TrustedCertificateAdapter.java
similarity index 100%
rename from src/frontends/android/src/org/strongswan/android/ui/adapter/TrustedCertificateAdapter.java
rename to src/frontends/android/app/src/main/java/org/strongswan/android/ui/adapter/TrustedCertificateAdapter.java
diff --git a/src/frontends/android/src/org/strongswan/android/ui/adapter/VpnProfileAdapter.java b/src/frontends/android/app/src/main/java/org/strongswan/android/ui/adapter/VpnProfileAdapter.java
similarity index 100%
rename from src/frontends/android/src/org/strongswan/android/ui/adapter/VpnProfileAdapter.java
rename to src/frontends/android/app/src/main/java/org/strongswan/android/ui/adapter/VpnProfileAdapter.java
diff --git a/src/frontends/android/src/org/strongswan/android/utils/BufferedByteWriter.java b/src/frontends/android/app/src/main/java/org/strongswan/android/utils/BufferedByteWriter.java
similarity index 100%
rename from src/frontends/android/src/org/strongswan/android/utils/BufferedByteWriter.java
rename to src/frontends/android/app/src/main/java/org/strongswan/android/utils/BufferedByteWriter.java
diff --git a/src/frontends/android/src/org/strongswan/android/utils/SettingsWriter.java b/src/frontends/android/app/src/main/java/org/strongswan/android/utils/SettingsWriter.java
similarity index 100%
rename from src/frontends/android/src/org/strongswan/android/utils/SettingsWriter.java
rename to src/frontends/android/app/src/main/java/org/strongswan/android/utils/SettingsWriter.java
diff --git a/src/frontends/android/src/org/strongswan/android/utils/Utils.java b/src/frontends/android/app/src/main/java/org/strongswan/android/utils/Utils.java
similarity index 100%
rename from src/frontends/android/src/org/strongswan/android/utils/Utils.java
rename to src/frontends/android/app/src/main/java/org/strongswan/android/utils/Utils.java
diff --git a/src/frontends/android/jni/.gitignore b/src/frontends/android/app/src/main/jni/.gitignore
similarity index 100%
rename from src/frontends/android/jni/.gitignore
rename to src/frontends/android/app/src/main/jni/.gitignore
diff --git a/src/frontends/android/jni/Android.mk b/src/frontends/android/app/src/main/jni/Android.mk
similarity index 100%
rename from src/frontends/android/jni/Android.mk
rename to src/frontends/android/app/src/main/jni/Android.mk
diff --git a/src/frontends/android/jni/Application.mk b/src/frontends/android/app/src/main/jni/Application.mk
similarity index 100%
rename from src/frontends/android/jni/Application.mk
rename to src/frontends/android/app/src/main/jni/Application.mk
diff --git a/src/frontends/android/jni/libandroidbridge/Android.mk b/src/frontends/android/app/src/main/jni/libandroidbridge/Android.mk
similarity index 100%
rename from src/frontends/android/jni/libandroidbridge/Android.mk
rename to src/frontends/android/app/src/main/jni/libandroidbridge/Android.mk
diff --git a/src/frontends/android/jni/libandroidbridge/android_jni.c b/src/frontends/android/app/src/main/jni/libandroidbridge/android_jni.c
similarity index 100%
rename from src/frontends/android/jni/libandroidbridge/android_jni.c
rename to src/frontends/android/app/src/main/jni/libandroidbridge/android_jni.c
diff --git a/src/frontends/android/jni/libandroidbridge/android_jni.h b/src/frontends/android/app/src/main/jni/libandroidbridge/android_jni.h
similarity index 100%
rename from src/frontends/android/jni/libandroidbridge/android_jni.h
rename to src/frontends/android/app/src/main/jni/libandroidbridge/android_jni.h
diff --git a/src/frontends/android/jni/libandroidbridge/backend/android_attr.c b/src/frontends/android/app/src/main/jni/libandroidbridge/backend/android_attr.c
similarity index 100%
rename from src/frontends/android/jni/libandroidbridge/backend/android_attr.c
rename to src/frontends/android/app/src/main/jni/libandroidbridge/backend/android_attr.c
diff --git a/src/frontends/android/jni/libandroidbridge/backend/android_attr.h b/src/frontends/android/app/src/main/jni/libandroidbridge/backend/android_attr.h
similarity index 100%
rename from src/frontends/android/jni/libandroidbridge/backend/android_attr.h
rename to src/frontends/android/app/src/main/jni/libandroidbridge/backend/android_attr.h
diff --git a/src/frontends/android/jni/libandroidbridge/backend/android_creds.c b/src/frontends/android/app/src/main/jni/libandroidbridge/backend/android_creds.c
similarity index 100%
rename from src/frontends/android/jni/libandroidbridge/backend/android_creds.c
rename to src/frontends/android/app/src/main/jni/libandroidbridge/backend/android_creds.c
diff --git a/src/frontends/android/jni/libandroidbridge/backend/android_creds.h b/src/frontends/android/app/src/main/jni/libandroidbridge/backend/android_creds.h
similarity index 100%
rename from src/frontends/android/jni/libandroidbridge/backend/android_creds.h
rename to src/frontends/android/app/src/main/jni/libandroidbridge/backend/android_creds.h
diff --git a/src/frontends/android/jni/libandroidbridge/backend/android_dns_proxy.c b/src/frontends/android/app/src/main/jni/libandroidbridge/backend/android_dns_proxy.c
similarity index 100%
rename from src/frontends/android/jni/libandroidbridge/backend/android_dns_proxy.c
rename to src/frontends/android/app/src/main/jni/libandroidbridge/backend/android_dns_proxy.c
diff --git a/src/frontends/android/jni/libandroidbridge/backend/android_dns_proxy.h b/src/frontends/android/app/src/main/jni/libandroidbridge/backend/android_dns_proxy.h
similarity index 100%
rename from src/frontends/android/jni/libandroidbridge/backend/android_dns_proxy.h
rename to src/frontends/android/app/src/main/jni/libandroidbridge/backend/android_dns_proxy.h
diff --git a/src/frontends/android/jni/libandroidbridge/backend/android_private_key.c b/src/frontends/android/app/src/main/jni/libandroidbridge/backend/android_private_key.c
similarity index 100%
rename from src/frontends/android/jni/libandroidbridge/backend/android_private_key.c
rename to src/frontends/android/app/src/main/jni/libandroidbridge/backend/android_private_key.c
diff --git a/src/frontends/android/jni/libandroidbridge/backend/android_private_key.h b/src/frontends/android/app/src/main/jni/libandroidbridge/backend/android_private_key.h
similarity index 100%
rename from src/frontends/android/jni/libandroidbridge/backend/android_private_key.h
rename to src/frontends/android/app/src/main/jni/libandroidbridge/backend/android_private_key.h
diff --git a/src/frontends/android/jni/libandroidbridge/backend/android_service.c b/src/frontends/android/app/src/main/jni/libandroidbridge/backend/android_service.c
similarity index 100%
rename from src/frontends/android/jni/libandroidbridge/backend/android_service.c
rename to src/frontends/android/app/src/main/jni/libandroidbridge/backend/android_service.c
diff --git a/src/frontends/android/jni/libandroidbridge/backend/android_service.h b/src/frontends/android/app/src/main/jni/libandroidbridge/backend/android_service.h
similarity index 100%
rename from src/frontends/android/jni/libandroidbridge/backend/android_service.h
rename to src/frontends/android/app/src/main/jni/libandroidbridge/backend/android_service.h
diff --git a/src/frontends/android/jni/libandroidbridge/byod/imc_android.c b/src/frontends/android/app/src/main/jni/libandroidbridge/byod/imc_android.c
similarity index 100%
rename from src/frontends/android/jni/libandroidbridge/byod/imc_android.c
rename to src/frontends/android/app/src/main/jni/libandroidbridge/byod/imc_android.c
diff --git a/src/frontends/android/jni/libandroidbridge/byod/imc_android.h b/src/frontends/android/app/src/main/jni/libandroidbridge/byod/imc_android.h
similarity index 100%
rename from src/frontends/android/jni/libandroidbridge/byod/imc_android.h
rename to src/frontends/android/app/src/main/jni/libandroidbridge/byod/imc_android.h
diff --git a/src/frontends/android/jni/libandroidbridge/byod/imc_android_state.c b/src/frontends/android/app/src/main/jni/libandroidbridge/byod/imc_android_state.c
similarity index 100%
rename from src/frontends/android/jni/libandroidbridge/byod/imc_android_state.c
rename to src/frontends/android/app/src/main/jni/libandroidbridge/byod/imc_android_state.c
diff --git a/src/frontends/android/jni/libandroidbridge/byod/imc_android_state.h b/src/frontends/android/app/src/main/jni/libandroidbridge/byod/imc_android_state.h
similarity index 100%
rename from src/frontends/android/jni/libandroidbridge/byod/imc_android_state.h
rename to src/frontends/android/app/src/main/jni/libandroidbridge/byod/imc_android_state.h
diff --git a/src/frontends/android/jni/libandroidbridge/charonservice.c b/src/frontends/android/app/src/main/jni/libandroidbridge/charonservice.c
similarity index 100%
rename from src/frontends/android/jni/libandroidbridge/charonservice.c
rename to src/frontends/android/app/src/main/jni/libandroidbridge/charonservice.c
diff --git a/src/frontends/android/jni/libandroidbridge/charonservice.h b/src/frontends/android/app/src/main/jni/libandroidbridge/charonservice.h
similarity index 100%
rename from src/frontends/android/jni/libandroidbridge/charonservice.h
rename to src/frontends/android/app/src/main/jni/libandroidbridge/charonservice.h
diff --git a/src/frontends/android/jni/libandroidbridge/kernel/android_ipsec.c b/src/frontends/android/app/src/main/jni/libandroidbridge/kernel/android_ipsec.c
similarity index 100%
rename from src/frontends/android/jni/libandroidbridge/kernel/android_ipsec.c
rename to src/frontends/android/app/src/main/jni/libandroidbridge/kernel/android_ipsec.c
diff --git a/src/frontends/android/jni/libandroidbridge/kernel/android_ipsec.h b/src/frontends/android/app/src/main/jni/libandroidbridge/kernel/android_ipsec.h
similarity index 100%
rename from src/frontends/android/jni/libandroidbridge/kernel/android_ipsec.h
rename to src/frontends/android/app/src/main/jni/libandroidbridge/kernel/android_ipsec.h
diff --git a/src/frontends/android/jni/libandroidbridge/kernel/android_net.c b/src/frontends/android/app/src/main/jni/libandroidbridge/kernel/android_net.c
similarity index 100%
rename from src/frontends/android/jni/libandroidbridge/kernel/android_net.c
rename to src/frontends/android/app/src/main/jni/libandroidbridge/kernel/android_net.c
diff --git a/src/frontends/android/jni/libandroidbridge/kernel/android_net.h b/src/frontends/android/app/src/main/jni/libandroidbridge/kernel/android_net.h
similarity index 100%
rename from src/frontends/android/jni/libandroidbridge/kernel/android_net.h
rename to src/frontends/android/app/src/main/jni/libandroidbridge/kernel/android_net.h
diff --git a/src/frontends/android/jni/libandroidbridge/kernel/network_manager.c b/src/frontends/android/app/src/main/jni/libandroidbridge/kernel/network_manager.c
similarity index 100%
rename from src/frontends/android/jni/libandroidbridge/kernel/network_manager.c
rename to src/frontends/android/app/src/main/jni/libandroidbridge/kernel/network_manager.c
diff --git a/src/frontends/android/jni/libandroidbridge/kernel/network_manager.h b/src/frontends/android/app/src/main/jni/libandroidbridge/kernel/network_manager.h
similarity index 100%
rename from src/frontends/android/jni/libandroidbridge/kernel/network_manager.h
rename to src/frontends/android/app/src/main/jni/libandroidbridge/kernel/network_manager.h
diff --git a/src/frontends/android/jni/libandroidbridge/vpnservice_builder.c b/src/frontends/android/app/src/main/jni/libandroidbridge/vpnservice_builder.c
similarity index 100%
rename from src/frontends/android/jni/libandroidbridge/vpnservice_builder.c
rename to src/frontends/android/app/src/main/jni/libandroidbridge/vpnservice_builder.c
diff --git a/src/frontends/android/jni/libandroidbridge/vpnservice_builder.h b/src/frontends/android/app/src/main/jni/libandroidbridge/vpnservice_builder.h
similarity index 100%
rename from src/frontends/android/jni/libandroidbridge/vpnservice_builder.h
rename to src/frontends/android/app/src/main/jni/libandroidbridge/vpnservice_builder.h
diff --git a/src/frontends/android/res/drawable-hdpi/ic_launcher.png b/src/frontends/android/app/src/main/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from src/frontends/android/res/drawable-hdpi/ic_launcher.png
rename to src/frontends/android/app/src/main/res/drawable-hdpi/ic_launcher.png
diff --git a/src/frontends/android/res/drawable-mdpi/ic_launcher.png b/src/frontends/android/app/src/main/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from src/frontends/android/res/drawable-mdpi/ic_launcher.png
rename to src/frontends/android/app/src/main/res/drawable-mdpi/ic_launcher.png
diff --git a/src/frontends/android/res/drawable-xhdpi/ic_launcher.png b/src/frontends/android/app/src/main/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from src/frontends/android/res/drawable-xhdpi/ic_launcher.png
rename to src/frontends/android/app/src/main/res/drawable-xhdpi/ic_launcher.png
diff --git a/src/frontends/android/res/drawable/remediation_instruction_background_large.xml b/src/frontends/android/app/src/main/res/drawable/remediation_instruction_background_large.xml
similarity index 100%
rename from src/frontends/android/res/drawable/remediation_instruction_background_large.xml
rename to src/frontends/android/app/src/main/res/drawable/remediation_instruction_background_large.xml
diff --git a/src/frontends/android/res/drawable/state_background.xml b/src/frontends/android/app/src/main/res/drawable/state_background.xml
similarity index 100%
rename from src/frontends/android/res/drawable/state_background.xml
rename to src/frontends/android/app/src/main/res/drawable/state_background.xml
diff --git a/src/frontends/android/res/layout-large/remediation_instructions.xml b/src/frontends/android/app/src/main/res/layout-large/remediation_instructions.xml
similarity index 100%
rename from src/frontends/android/res/layout-large/remediation_instructions.xml
rename to src/frontends/android/app/src/main/res/layout-large/remediation_instructions.xml
diff --git a/src/frontends/android/res/layout/imc_state_fragment.xml b/src/frontends/android/app/src/main/res/layout/imc_state_fragment.xml
similarity index 100%
rename from src/frontends/android/res/layout/imc_state_fragment.xml
rename to src/frontends/android/app/src/main/res/layout/imc_state_fragment.xml
diff --git a/src/frontends/android/res/layout/log_activity.xml b/src/frontends/android/app/src/main/res/layout/log_activity.xml
similarity index 100%
rename from src/frontends/android/res/layout/log_activity.xml
rename to src/frontends/android/app/src/main/res/layout/log_activity.xml
diff --git a/src/frontends/android/res/layout/log_fragment.xml b/src/frontends/android/app/src/main/res/layout/log_fragment.xml
similarity index 100%
rename from src/frontends/android/res/layout/log_fragment.xml
rename to src/frontends/android/app/src/main/res/layout/log_fragment.xml
diff --git a/src/frontends/android/res/layout/login_dialog.xml b/src/frontends/android/app/src/main/res/layout/login_dialog.xml
similarity index 100%
rename from src/frontends/android/res/layout/login_dialog.xml
rename to src/frontends/android/app/src/main/res/layout/login_dialog.xml
diff --git a/src/frontends/android/res/layout/main.xml b/src/frontends/android/app/src/main/res/layout/main.xml
similarity index 100%
rename from src/frontends/android/res/layout/main.xml
rename to src/frontends/android/app/src/main/res/layout/main.xml
diff --git a/src/frontends/android/res/layout/profile_detail_view.xml b/src/frontends/android/app/src/main/res/layout/profile_detail_view.xml
similarity index 100%
rename from src/frontends/android/res/layout/profile_detail_view.xml
rename to src/frontends/android/app/src/main/res/layout/profile_detail_view.xml
diff --git a/src/frontends/android/res/layout/profile_list_fragment.xml b/src/frontends/android/app/src/main/res/layout/profile_list_fragment.xml
similarity index 100%
rename from src/frontends/android/res/layout/profile_list_fragment.xml
rename to src/frontends/android/app/src/main/res/layout/profile_list_fragment.xml
diff --git a/src/frontends/android/res/layout/profile_list_item.xml b/src/frontends/android/app/src/main/res/layout/profile_list_item.xml
similarity index 100%
rename from src/frontends/android/res/layout/profile_list_item.xml
rename to src/frontends/android/app/src/main/res/layout/profile_list_item.xml
diff --git a/src/frontends/android/res/layout/remediation_instruction.xml b/src/frontends/android/app/src/main/res/layout/remediation_instruction.xml
similarity index 100%
rename from src/frontends/android/res/layout/remediation_instruction.xml
rename to src/frontends/android/app/src/main/res/layout/remediation_instruction.xml
diff --git a/src/frontends/android/res/layout/remediation_instruction_item.xml b/src/frontends/android/app/src/main/res/layout/remediation_instruction_item.xml
similarity index 100%
rename from src/frontends/android/res/layout/remediation_instruction_item.xml
rename to src/frontends/android/app/src/main/res/layout/remediation_instruction_item.xml
diff --git a/src/frontends/android/res/layout/remediation_instructions.xml b/src/frontends/android/app/src/main/res/layout/remediation_instructions.xml
similarity index 100%
rename from src/frontends/android/res/layout/remediation_instructions.xml
rename to src/frontends/android/app/src/main/res/layout/remediation_instructions.xml
diff --git a/src/frontends/android/res/layout/trusted_certificates_activity.xml b/src/frontends/android/app/src/main/res/layout/trusted_certificates_activity.xml
similarity index 100%
rename from src/frontends/android/res/layout/trusted_certificates_activity.xml
rename to src/frontends/android/app/src/main/res/layout/trusted_certificates_activity.xml
diff --git a/src/frontends/android/res/layout/trusted_certificates_item.xml b/src/frontends/android/app/src/main/res/layout/trusted_certificates_item.xml
similarity index 100%
rename from src/frontends/android/res/layout/trusted_certificates_item.xml
rename to src/frontends/android/app/src/main/res/layout/trusted_certificates_item.xml
diff --git a/src/frontends/android/res/layout/two_line_button.xml b/src/frontends/android/app/src/main/res/layout/two_line_button.xml
similarity index 100%
rename from src/frontends/android/res/layout/two_line_button.xml
rename to src/frontends/android/app/src/main/res/layout/two_line_button.xml
diff --git a/src/frontends/android/res/layout/vpn_profile_select.xml b/src/frontends/android/app/src/main/res/layout/vpn_profile_select.xml
similarity index 100%
rename from src/frontends/android/res/layout/vpn_profile_select.xml
rename to src/frontends/android/app/src/main/res/layout/vpn_profile_select.xml
diff --git a/src/frontends/android/res/layout/vpn_state_fragment.xml b/src/frontends/android/app/src/main/res/layout/vpn_state_fragment.xml
similarity index 100%
rename from src/frontends/android/res/layout/vpn_state_fragment.xml
rename to src/frontends/android/app/src/main/res/layout/vpn_state_fragment.xml
diff --git a/src/frontends/android/res/menu/certificates.xml b/src/frontends/android/app/src/main/res/menu/certificates.xml
similarity index 100%
rename from src/frontends/android/res/menu/certificates.xml
rename to src/frontends/android/app/src/main/res/menu/certificates.xml
diff --git a/src/frontends/android/res/menu/log.xml b/src/frontends/android/app/src/main/res/menu/log.xml
similarity index 100%
rename from src/frontends/android/res/menu/log.xml
rename to src/frontends/android/app/src/main/res/menu/log.xml
diff --git a/src/frontends/android/res/menu/main.xml b/src/frontends/android/app/src/main/res/menu/main.xml
similarity index 100%
rename from src/frontends/android/res/menu/main.xml
rename to src/frontends/android/app/src/main/res/menu/main.xml
diff --git a/src/frontends/android/res/menu/profile_edit.xml b/src/frontends/android/app/src/main/res/menu/profile_edit.xml
similarity index 100%
rename from src/frontends/android/res/menu/profile_edit.xml
rename to src/frontends/android/app/src/main/res/menu/profile_edit.xml
diff --git a/src/frontends/android/res/menu/profile_list.xml b/src/frontends/android/app/src/main/res/menu/profile_list.xml
similarity index 100%
rename from src/frontends/android/res/menu/profile_list.xml
rename to src/frontends/android/app/src/main/res/menu/profile_list.xml
diff --git a/src/frontends/android/res/menu/profile_list_context.xml b/src/frontends/android/app/src/main/res/menu/profile_list_context.xml
similarity index 100%
rename from src/frontends/android/res/menu/profile_list_context.xml
rename to src/frontends/android/app/src/main/res/menu/profile_list_context.xml
diff --git a/src/frontends/android/res/values-de/arrays.xml b/src/frontends/android/app/src/main/res/values-de/arrays.xml
similarity index 100%
rename from src/frontends/android/res/values-de/arrays.xml
rename to src/frontends/android/app/src/main/res/values-de/arrays.xml
diff --git a/src/frontends/android/res/values-de/strings.xml b/src/frontends/android/app/src/main/res/values-de/strings.xml
similarity index 100%
rename from src/frontends/android/res/values-de/strings.xml
rename to src/frontends/android/app/src/main/res/values-de/strings.xml
diff --git a/src/frontends/android/res/values-pl/arrays.xml b/src/frontends/android/app/src/main/res/values-pl/arrays.xml
similarity index 100%
rename from src/frontends/android/res/values-pl/arrays.xml
rename to src/frontends/android/app/src/main/res/values-pl/arrays.xml
diff --git a/src/frontends/android/res/values-pl/strings.xml b/src/frontends/android/app/src/main/res/values-pl/strings.xml
similarity index 100%
rename from src/frontends/android/res/values-pl/strings.xml
rename to src/frontends/android/app/src/main/res/values-pl/strings.xml
diff --git a/src/frontends/android/res/values-ru/arrays.xml b/src/frontends/android/app/src/main/res/values-ru/arrays.xml
similarity index 100%
rename from src/frontends/android/res/values-ru/arrays.xml
rename to src/frontends/android/app/src/main/res/values-ru/arrays.xml
diff --git a/src/frontends/android/res/values-ru/strings.xml b/src/frontends/android/app/src/main/res/values-ru/strings.xml
similarity index 100%
rename from src/frontends/android/res/values-ru/strings.xml
rename to src/frontends/android/app/src/main/res/values-ru/strings.xml
diff --git a/src/frontends/android/res/values-ua/arrays.xml b/src/frontends/android/app/src/main/res/values-ua/arrays.xml
similarity index 100%
rename from src/frontends/android/res/values-ua/arrays.xml
rename to src/frontends/android/app/src/main/res/values-ua/arrays.xml
diff --git a/src/frontends/android/res/values-ua/strings.xml b/src/frontends/android/app/src/main/res/values-ua/strings.xml
similarity index 100%
rename from src/frontends/android/res/values-ua/strings.xml
rename to src/frontends/android/app/src/main/res/values-ua/strings.xml
diff --git a/src/frontends/android/res/values/arrays.xml b/src/frontends/android/app/src/main/res/values/arrays.xml
similarity index 100%
rename from src/frontends/android/res/values/arrays.xml
rename to src/frontends/android/app/src/main/res/values/arrays.xml
diff --git a/src/frontends/android/res/values/attrs.xml b/src/frontends/android/app/src/main/res/values/attrs.xml
similarity index 100%
rename from src/frontends/android/res/values/attrs.xml
rename to src/frontends/android/app/src/main/res/values/attrs.xml
diff --git a/src/frontends/android/res/values/colors.xml b/src/frontends/android/app/src/main/res/values/colors.xml
similarity index 100%
rename from src/frontends/android/res/values/colors.xml
rename to src/frontends/android/app/src/main/res/values/colors.xml
diff --git a/src/frontends/android/res/values/strings.xml b/src/frontends/android/app/src/main/res/values/strings.xml
similarity index 100%
rename from src/frontends/android/res/values/strings.xml
rename to src/frontends/android/app/src/main/res/values/strings.xml
diff --git a/src/frontends/android/res/values/styles.xml b/src/frontends/android/app/src/main/res/values/styles.xml
similarity index 100%
rename from src/frontends/android/res/values/styles.xml
rename to src/frontends/android/app/src/main/res/values/styles.xml
diff --git a/src/frontends/android/build.gradle b/src/frontends/android/build.gradle
new file mode 100644
index 000000000..9b18c6e90
--- /dev/null
+++ b/src/frontends/android/build.gradle
@@ -0,0 +1,14 @@
+buildscript {
+ repositories {
+ jcenter()
+ }
+ dependencies {
+ classpath 'com.android.tools.build:gradle:1.3.0'
+ }
+}
+
+allprojects {
+ repositories {
+ jcenter()
+ }
+}
diff --git a/src/frontends/android/gradle/wrapper/gradle-wrapper.jar b/src/frontends/android/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 000000000..8c0fb64a8
Binary files /dev/null and b/src/frontends/android/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/src/frontends/android/gradle/wrapper/gradle-wrapper.properties b/src/frontends/android/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 000000000..0c71e760d
--- /dev/null
+++ b/src/frontends/android/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Wed Apr 10 15:27:10 PDT 2013
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip
diff --git a/src/frontends/android/gradlew b/src/frontends/android/gradlew
new file mode 100755
index 000000000..91a7e269e
--- /dev/null
+++ b/src/frontends/android/gradlew
@@ -0,0 +1,164 @@
+#!/usr/bin/env bash
+
+##############################################################################
+##
+## Gradle start up script for UN*X
+##
+##############################################################################
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn ( ) {
+ echo "$*"
+}
+
+die ( ) {
+ echo
+ echo "$*"
+ echo
+ exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+case "`uname`" in
+ CYGWIN* )
+ cygwin=true
+ ;;
+ Darwin* )
+ darwin=true
+ ;;
+ MINGW* )
+ msys=true
+ ;;
+esac
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched.
+if $cygwin ; then
+ [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+fi
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+ ls=`ls -ld "$PRG"`
+ link=`expr "$ls" : '.*-> \(.*\)$'`
+ if expr "$link" : '/.*' > /dev/null; then
+ PRG="$link"
+ else
+ PRG=`dirname "$PRG"`"/$link"
+ fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >&-
+APP_HOME="`pwd -P`"
+cd "$SAVED" >&-
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+ if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+ # IBM's JDK on AIX uses strange locations for the executables
+ JAVACMD="$JAVA_HOME/jre/sh/java"
+ else
+ JAVACMD="$JAVA_HOME/bin/java"
+ fi
+ if [ ! -x "$JAVACMD" ] ; then
+ die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+ fi
+else
+ JAVACMD="java"
+ which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+ MAX_FD_LIMIT=`ulimit -H -n`
+ if [ $? -eq 0 ] ; then
+ if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+ MAX_FD="$MAX_FD_LIMIT"
+ fi
+ ulimit -n $MAX_FD
+ if [ $? -ne 0 ] ; then
+ warn "Could not set maximum file descriptor limit: $MAX_FD"
+ fi
+ else
+ warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+ fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+ GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+ APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+ CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
+ # We build the pattern for arguments to be converted via cygpath
+ ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+ SEP=""
+ for dir in $ROOTDIRSRAW ; do
+ ROOTDIRS="$ROOTDIRS$SEP$dir"
+ SEP="|"
+ done
+ OURCYGPATTERN="(^($ROOTDIRS))"
+ # Add a user-defined pattern to the cygpath arguments
+ if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+ OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+ fi
+ # Now convert the arguments - kludge to limit ourselves to /bin/sh
+ i=0
+ for arg in "$@" ; do
+ CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+ CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
+
+ if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
+ eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+ else
+ eval `echo args$i`="\"$arg\""
+ fi
+ i=$((i+1))
+ done
+ case $i in
+ (0) set -- ;;
+ (1) set -- "$args0" ;;
+ (2) set -- "$args0" "$args1" ;;
+ (3) set -- "$args0" "$args1" "$args2" ;;
+ (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+ (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+ (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+ (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+ (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+ (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+ esac
+fi
+
+# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
+function splitJvmOpts() {
+ JVM_OPTS=("$@")
+}
+eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
+JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+
+exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
diff --git a/src/frontends/android/gradlew.bat b/src/frontends/android/gradlew.bat
new file mode 100644
index 000000000..aec99730b
--- /dev/null
+++ b/src/frontends/android/gradlew.bat
@@ -0,0 +1,90 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windowz variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+if "%@eval[2+2]" == "4" goto 4NT_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+goto execute
+
+:4NT_args
+@rem Get arguments from the 4NT Shell from JP Software
+set CMD_LINE_ARGS=%$
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/src/frontends/android/proguard.cfg b/src/frontends/android/proguard.cfg
deleted file mode 100644
index b1cdf17b5..000000000
--- a/src/frontends/android/proguard.cfg
+++ /dev/null
@@ -1,40 +0,0 @@
--optimizationpasses 5
--dontusemixedcaseclassnames
--dontskipnonpubliclibraryclasses
--dontpreverify
--verbose
--optimizations !code/simplification/arithmetic,!field/*,!class/merging/*
-
--keep public class * extends android.app.Activity
--keep public class * extends android.app.Application
--keep public class * extends android.app.Service
--keep public class * extends android.content.BroadcastReceiver
--keep public class * extends android.content.ContentProvider
--keep public class * extends android.app.backup.BackupAgentHelper
--keep public class * extends android.preference.Preference
--keep public class com.android.vending.licensing.ILicensingService
-
--keepclasseswithmembernames class * {
- native ;
-}
-
--keepclasseswithmembers class * {
- public (android.content.Context, android.util.AttributeSet);
-}
-
--keepclasseswithmembers class * {
- public (android.content.Context, android.util.AttributeSet, int);
-}
-
--keepclassmembers class * extends android.app.Activity {
- public void *(android.view.View);
-}
-
--keepclassmembers enum * {
- public static **[] values();
- public static ** valueOf(java.lang.String);
-}
-
--keep class * implements android.os.Parcelable {
- public static final android.os.Parcelable$Creator *;
-}
diff --git a/src/frontends/android/project.properties b/src/frontends/android/project.properties
deleted file mode 100644
index bbe203c84..000000000
--- a/src/frontends/android/project.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-# This file is automatically generated by Android Tools.
-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-#
-# This file must be checked in Version Control Systems.
-#
-# To customize properties used by the Ant build system use,
-# "ant.properties", and override values to adapt the script to your
-# project structure.
-
-# Project target.
-target=android-21
diff --git a/src/frontends/android/settings.gradle b/src/frontends/android/settings.gradle
new file mode 100644
index 000000000..e7b4def49
--- /dev/null
+++ b/src/frontends/android/settings.gradle
@@ -0,0 +1 @@
+include ':app'