summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorPedro J. Estébanez <pedrojrulez@gmail.com>2016-06-15 15:21:18 +0200
committerPedro J. Estébanez <pedrojrulez@gmail.com>2016-06-27 10:49:15 +0200
commite7b2626707457fe1d6af36da3d7a1ec3863cd52f (patch)
treee26d425d30bc9ce108ab260e8aff8fca181a3dba /.gitignore
parent2c59f778850dc4450481680e859efd66660c9119 (diff)
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
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore9
1 files changed, 1 insertions, 8 deletions
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