Split the Android platform java logic into an Android library module (lib) and an application module (app).

The application module `app` serves double duties of providing the prebuilt Godot binaries ('android_debug.apk', 'android_release.apk') and the Godot custom build template ('android_source.zip').
This commit is contained in:
fhuya
2019-09-02 17:31:51 -07:00
parent ba854bbc7b
commit 7fabfd402f
141 changed files with 386 additions and 282 deletions

View File

@@ -50,30 +50,8 @@ if lib_arch_dir != '':
else: # release_debug, debug
lib_type_dir = 'debug'
out_dir = '#platform/android/java/libs/' + lib_type_dir + '/' + lib_arch_dir
out_dir = '#platform/android/java/lib/libs/' + lib_type_dir + '/' + lib_arch_dir
env_android.Command(out_dir + '/libgodot_android.so', '#bin/libgodot' + env['SHLIBSUFFIX'], Move("$TARGET", "$SOURCE"))
stl_lib_path = str(env['ANDROID_NDK_ROOT']) + '/sources/cxx-stl/llvm-libc++/libs/' + lib_arch_dir + '/libc++_shared.so'
env_android.Command(out_dir + '/libc++_shared.so', stl_lib_path, Copy("$TARGET", "$SOURCE"))
# Zip android/java folder for the source export template.
print("Archiving platform/android/java as bin/android_source.zip...")
import os
import zipfile
# Change dir to avoid have zipped paths start from the android/java folder.
olddir = os.getcwd()
os.chdir(Dir('#platform/android/java').abspath)
bindir = Dir('#bin').abspath
# Make 'bin' dir if missing, can happen on fresh clone.
if not os.path.exists(bindir):
os.makedirs(bindir)
zipf = zipfile.ZipFile(os.path.join(bindir, 'android_source.zip'), 'w', zipfile.ZIP_DEFLATED)
exclude_dirs = ['.gradle', 'build', 'libs', 'patches']
for root, dirs, files in os.walk('.', topdown=True):
# Change 'dirs' in place to exclude folders we don't want.
# https://stackoverflow.com/a/19859907
dirs[:] = [d for d in dirs if d not in exclude_dirs]
for f in files:
zipf.write(os.path.join(root, f))
zipf.close()
os.chdir(olddir)