Merge pull request #5077 from RandomShaper/improve-android-build

Improve Android build

1 files changed, 18 insertions, 4 deletions

diff --git a/platform/android/build.gradle.template b/platform/android/build.gradle.template
index 9e617a9e9e..24951b921b 100644
--- a/platform/android/build.gradle.template
+++ b/platform/android/build.gradle.template
@@ -3,7 +3,7 @@ buildscript {
 		jcenter()
 	}
 	dependencies {
-		classpath 'com.android.tools.build:gradle:1.3.1'
+		classpath 'com.android.tools.build:gradle:2.1.0'
 	}
 }
 
@@ -41,6 +41,11 @@ android {
 		targetSdkVersion 23
 		$$GRADLE_DEFAULT_CONFIG$$
 	}
+	// Both signing and zip-aligning will be done at export time
+	buildTypes.all { buildType ->
+		buildType.zipAlignEnabled false
+		buildType.signingConfig null
+	}
 	sourceSets {
 		main {
 			manifest.srcFile 'AndroidManifest.xml'
@@ -66,8 +71,17 @@ android {
 				$$GRADLE_JNI_DIRS$$
 			]
 		}
-
+		debug.jniLibs.srcDirs = [
+			'libs/debug'
+			$$GRADLE_JNI_DIRS$$
+		]
+		release.jniLibs.srcDirs = [
+			'libs/release'
+			$$GRADLE_JNI_DIRS$$
+		]
+	}
+	applicationVariants.all { variant ->
+		// ApplicationVariant is undocumented, but this method is widely used; may break with another version of the Android Gradle plugin
+		variant.outputs.get(0).setOutputFile(new File("${projectDir}/../../../bin", "android_${variant.name}.apk"))
 	}
-
-
 }