diff options
| author | Pedro J. Estébanez <pedrojrulez@gmail.com> | 2016-06-15 15:21:18 +0200 |
|---|---|---|
| committer | Pedro J. Estébanez <pedrojrulez@gmail.com> | 2016-06-27 10:49:15 +0200 |
| commit | e7b2626707457fe1d6af36da3d7a1ec3863cd52f (patch) | |
| tree | e26d425d30bc9ce108ab260e8aff8fca181a3dba /platform/android/export/export.cpp | |
| parent | 2c59f778850dc4450481680e859efd66660c9119 (diff) | |
| download | redot-engine-e7b2626707457fe1d6af36da3d7a1ec3863cd52f.tar.gz | |
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 'platform/android/export/export.cpp')
| -rw-r--r-- | platform/android/export/export.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/platform/android/export/export.cpp b/platform/android/export/export.cpp index 872f047c95..83f7292716 100644 --- a/platform/android/export/export.cpp +++ b/platform/android/export/export.cpp @@ -1166,7 +1166,7 @@ Error EditorExportPlatformAndroid::export_project(const String& p_path, bool p_d skip=true; } - if (file=="lib/armeabi/libgodot_android.so" && !export_arm) { + if (file.match("lib/armeabi*/libgodot_android.so") && !export_arm) { skip=true; } |