ScummVM/scummvm-sites
1
0
Fork 0
mirror of https://github.com/scummvm/scummvm-sites.git synced 2026-05-21 05:40:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

BUILDBOT: Update Android NDK to r21d, support cross-compiled libs

Browse Source
This commit is contained in:
antoniou79
2020-07-21 23:03:26 +03:00
parent 916c01e0ed
commit 39a43fdc46
1 changed files with 49 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/master.cfg
+49 -8
View File
@@ -1323,20 +1323,34 @@ p = {
scumm_platforms_master["gcw0"] = p
scumm_platforms_stable["gcw0"] = p
# Android - Shared (post Mar 28 2020)
scumm_root_android = "/opt/toolchains/android/2020-03-28"
# Android - Shared (post Jul 20 2020)
scumm_root_android = "/opt/toolchains/android/2020-07-20"
scumm_env_android = copy.deepcopy(scumm_env)
scumm_env_android["ANDROID_SDK_ROOT"] = scumm_root_android
scumm_env_android["ANDROID_NDK_ROOT"] = "%s/ndk/21.0.6113669" % scumm_root_android
# build-tools folder has tools like zipalign (used post-build for apks that need aligning)
scumm_android_btools_version = "29.0.3"
scumm_android_ndk_version = "21.3.6528147"
scumm_env_android["ANDROID_SDK_ROOT"] = scumm_root_android
scumm_env_android["ANDROID_NDK_ROOT"] = "%s/ndk/%s" % (scumm_root_android, scumm_android_ndk_version)
scumm_env_android["ANDROID_TOOLCHAIN"] = "%s/toolchains/llvm/prebuilt/linux-x86_64" % scumm_env_android["ANDROID_NDK_ROOT"]
scumm_env_android["PATH"] = "%s/tools:%s/build-tools/%s:%s" % (scumm_env_android["ANDROID_SDK_ROOT"], scumm_env_android["ANDROID_SDK_ROOT"], scumm_android_btools_version, DEFAULT_PATH)
# Android - ARM-V7A
scumm_env_android_arm_v7a = copy.deepcopy(scumm_env_android)
scumm_android_v7a_3rd_libs_path = "%s/libraries/armv7a" % scumm_root_android
scumm_env_android_arm_v7a["PATH"] = %s/bin:%s/bin:%s" % (scumm_env_android["ANDROID_TOOLCHAIN"], scumm_android_v7a_3rd_libs_path, scumm_env_android["PATH"])
scumm_env_android_arm_v7a["CXXFLAGS"] = "-I%s/include" % scumm_android_v7a_3rd_libs_path
scumm_env_android_arm_v7a["LDFLAGS"] = "-L%s/lib" % scumm_android_v7a_3rd_libs_path
scumm_env_android_arm_v7a["PKG_CONFIG_LIBDIR"] = "%s/lib/pkgconfig" % scumm_android_v7a_3rd_libs_path
p = {
"configureargs": [
"--host=android-arm-v7a",
"--enable-debug"
],
"env": scumm_env_android,
"env": scumm_env_android_arm_v7a,
"disttarget": "androiddistdebug",
"package": [ "debug" ],
"archive_format": "zip"
@@ -1347,12 +1361,21 @@ scumm_platforms_stable["android_arm_v7a"] = p
scumm_untestable_platforms.append("android_arm_v7a")
# Android - ARM64-V8A
scumm_env_android_arm64_v8a = copy.deepcopy(scumm_env_android)
scumm_android_v8a_3rd_libs_path = "%s/libraries/aarch64" % scumm_root_android
scumm_env_android_arm64_v8a["PATH"] = %s/bin:%s/bin:%s" % (scumm_env_android["ANDROID_TOOLCHAIN"], scumm_android_v8a_3rd_libs_path, scumm_env_android["PATH"])
scumm_env_android_arm64_v8a["CXXFLAGS"] = "-I%s/include" % scumm_android_v8a_3rd_libs_path
scumm_env_android_arm64_v8a["LDFLAGS"] = "-L%s/lib" % scumm_android_v8a_3rd_libs_path
scumm_env_android_arm64_v8a["PKG_CONFIG_LIBDIR"] = "%s/lib/pkgconfig" % scumm_android_v8a_3rd_libs_path
p = {
"configureargs": [
"--host=android-arm64-v8a",
"--enable-debug"
],
"env": scumm_env_android,
"env": scumm_env_android_arm64_v8a,
"disttarget": "androiddistdebug",
"package": [ "debug" ],
"archive_format": "zip"
@@ -1363,12 +1386,21 @@ scumm_platforms_stable["android_arm64"] = p
scumm_untestable_platforms.append("android_arm64")
# Android - x86
scumm_env_android_x86 = copy.deepcopy(scumm_env_android)
scumm_android_x86_3rd_libs_path = "%s/libraries/i686" % scumm_root_android
scumm_env_android_x86["PATH"] = %s/bin:%s/bin:%s" % (scumm_env_android["ANDROID_TOOLCHAIN"], scumm_android_x86_3rd_libs_path, scumm_env_android["PATH"])
scumm_env_android_x86["CXXFLAGS"] = "-I%s/include" % scumm_android_x86_3rd_libs_path
scumm_env_android_x86["LDFLAGS"] = "-L%s/lib" % scumm_android_x86_3rd_libs_path
scumm_env_android_x86["PKG_CONFIG_LIBDIR"] = "%s/lib/pkgconfig" % scumm_android_x86_3rd_libs_path
p = {
"configureargs": [
"--host=android-x86",
"--enable-debug"
],
"env": scumm_env_android,
"env": scumm_env_android_x86,
"disttarget": "androiddistdebug",
"package": [ "debug" ],
"archive_format": "zip"
@@ -1379,12 +1411,21 @@ scumm_platforms_stable["android_x86"] = p
scumm_untestable_platforms.append("android_x86")
# Android - x86_64
scumm_env_android_x86_64 = copy.deepcopy(scumm_env_android)
scumm_android_x86_64_3rd_libs_path = "%s/libraries/x86_64" % scumm_root_android
scumm_env_android_x86_64["PATH"] = %s/bin:%s/bin:%s" % (scumm_env_android["ANDROID_TOOLCHAIN"], scumm_android_x86_64_3rd_libs_path, scumm_env_android["PATH"])
scumm_env_android_x86_64["CXXFLAGS"] = "-I%s/include" % scumm_android_x86_64_3rd_libs_path
scumm_env_android_x86_64["LDFLAGS"] = "-L%s/lib" % scumm_android_x86_64_3rd_libs_path
scumm_env_android_x86_64["PKG_CONFIG_LIBDIR"] = "%s/lib/pkgconfig" % scumm_android_x86_64_3rd_libs_path
p = {
"configureargs": [
"--host=android-x86_64",
"--enable-debug"
],
"env": scumm_env_android,
"env": scumm_env_android_x86_64,
"disttarget": "androiddistdebug",
"package": [ "debug" ],
"archive_format": "zip"