diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2016-07-10 13:57:17 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-10 13:57:17 -0300 |
| commit | d279d060e18fba43c83c77b0f91dcf2f6bfb3fd2 (patch) | |
| tree | 6f867fe9eb9b6620fa5da18fcf99e4207b04af49 /platform/android/SCsub | |
| parent | 8462127aa904eb394f86240d18ad0d488011b1ba (diff) | |
| parent | e7b2626707457fe1d6af36da3d7a1ec3863cd52f (diff) | |
Merge pull request #5077 from RandomShaper/improve-android-build
Improve Android build
Diffstat (limited to 'platform/android/SCsub')
| -rw-r--r-- | platform/android/SCsub | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/platform/android/SCsub b/platform/android/SCsub index 0814f4a7bc..60bb4bd613 100644 --- a/platform/android/SCsub +++ b/platform/android/SCsub @@ -109,4 +109,22 @@ pp_baseout.write( manifest ) env_android.SharedLibrary("#bin/libgodot",[android_objects],SHLIBSUFFIX=env["SHLIBSUFFIX"]) -#env.Command('#bin/libgodot_android.so', '#platform/android/libgodot_android.so', Copy('bin/libgodot_android.so', 'platform/android/libgodot_android.so')) + +lib_arch_dir = '' +if env['android_arch'] == 'armv6': + lib_arch_dir = 'armeabi' +elif env['android_arch'] == 'armv7': + lib_arch_dir = 'armeabi-v7a' +elif env['android_arch'] == 'x86': + lib_arch_dir = 'x86' +else: + print 'WARN: Architecture not suitable for embedding into APK; keeping .so at \\bin' + +if lib_arch_dir != '': + if env['target'] == 'release': + lib_type_dir = 'release' + else: # release_debug, debug + lib_type_dir = 'debug' + + out_dir = '#platform/android/java/libs/'+lib_type_dir+'/'+lib_arch_dir + env_android.Command(out_dir+'/libgodot_android.so', '#bin/libgodot'+env['SHLIBSUFFIX'], Move("$TARGET", "$SOURCE")) |