From e7b2626707457fe1d6af36da3d7a1ec3863cd52f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20J=2E=20Est=C3=A9banez?= Date: Wed, 15 Jun 2016 15:21:18 +0200 Subject: Make Android build smarter (SCons + Gradle) Upgrade Gradle and Android plugin for Gradle Disable all signing and zip-aligning for the export templates Give correct names to generated APKs Put .so files built by SCons right where Gradle has to pick them according to arch & build type Downgrade NDK platform to 14 to match minSdkVersion --- .gitignore | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to '.gitignore') diff --git a/.gitignore b/.gitignore index e1941b18df..f3a4e9714c 100644 --- a/.gitignore +++ b/.gitignore @@ -37,17 +37,10 @@ platform/android/java/.gradle platform/android/java/.gradletasknamecache platform/android/java/local.properties platform/android/java/project.properties +platform/android/java/build.gradle platform/android/java/AndroidManifest.xml -platform/android/java/bin/* platform/android/java/libs/* -platform/android/java/gen/* platform/android/java/assets -platform/android/libs/apk_expansion/bin/* -platform/android/libs/apk_expansion/gen/* -platform/android/libs/google_play_services/bin/* -platform/android/libs/google_play_services/gen/* -platform/android/libs/play_licensing/bin/* -platform/android/libs/play_licensing/gen/* # General c++ generated files *.lib -- cgit v1.2.3