Relintai/godot-mono-builds
1
0
Fork 0
mirror of https://github.com/Relintai/godot-mono-builds.git synced 2024-11-14 10:27:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #50 from akien-mga/android-bump-min-19-target-30

Browse Source 
Android: Bump min SDK to 19, target SDK to 30
This commit is contained in:
Rémi Verschelde 2021-08-17 08:54:25 +02:00 committed by GitHub
commit 0d72e71a50
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/build.yml vendored
View File

@ -34,8 +34,8 @@ env:
ANDROID_CMAKE_VERSION: 3.10.2.4988404 ANDROID_CMAKE_VERSION: 3.10.2.4988404
# These should be synced with the Godot repo. # These should be synced with the Godot repo.
# platform/android/java/app/config.gradle # platform/android/java/app/config.gradle
ANDROID_PLATFORM: android-29 ANDROID_PLATFORM: android-30
ANDROID_API: 18 ANDROID_API: 19
ANDROID_NDK_VERSION: 21.4.7075529 ANDROID_NDK_VERSION: 21.4.7075529
# platform/iphone/detect.py # platform/iphone/detect.py
IOS_VERSION_MIN: 10.0 IOS_VERSION_MIN: 10.0

2
README.md
View File

@ -11,7 +11,7 @@ While they may work with other versions, you might have issues applying patches
- Mono: 6.12.0.147. - Mono: 6.12.0.147.
- Emscripten: 1.39.9. - Emscripten: 1.39.9.
- Android: API level 29. - Android: API level 30.
## Command-line options ## Command-line options

19
android.py
View File

@ -104,17 +104,6 @@ def setup_android_target_template(env: dict, opts: AndroidOpts, target: str):
if target in extra_target_envs: if target in extra_target_envs:
env.update(extra_target_envs[target]) env.update(extra_target_envs[target])
android_new_ndk = True
with open(path_join(opts.android_ndk_root, 'source.properties')) as file:
for line in file:
line = line.strip()
if line.startswith('Pkg.Revision ') or line.startswith('Pkg.Revision='):
pkg_revision = line.split('=')[1].strip()
mayor = int(pkg_revision.split('.')[0])
android_new_ndk = mayor >= 18
break
arch = AndroidTargetTable.archs[target] arch = AndroidTargetTable.archs[target]
abi_name = AndroidTargetTable.abi_names[target] abi_name = AndroidTargetTable.abi_names[target]
host_triple = AndroidTargetTable.host_triples[target] host_triple = AndroidTargetTable.host_triples[target]
@ -176,14 +165,14 @@ def setup_android_target_template(env: dict, opts: AndroidOpts, target: str):
CFLAGS += [ CFLAGS += [
'-fstack-protector', '-fstack-protector',
'-DMONODROID=1' '-DMONODROID=1'
'-D__ANDROID_API__=' + api,
] ]
CFLAGS += ['-D__ANDROID_API__=' + api] if android_new_ndk else []
CXXFLAGS += [ CXXFLAGS += [
'-fstack-protector', '-fstack-protector',
'-DMONODROID=1' '-DMONODROID=1'
'-D__ANDROID_API__=' + api,
] ]
CXXFLAGS += ['-D__ANDROID_API__=' + api] if android_new_ndk else []
CPPFLAGS += ['-I%s/sysroot/usr/include' % toolchain_path] CPPFLAGS += ['-I%s/sysroot/usr/include' % toolchain_path]
CXXCPPFLAGS += ['-I%s/sysroot/usr/include' % toolchain_path] CXXCPPFLAGS += ['-I%s/sysroot/usr/include' % toolchain_path]
@ -216,7 +205,7 @@ def setup_android_target_template(env: dict, opts: AndroidOpts, target: str):
] ]
CONFIGURE_FLAGS += ['--enable-monodroid'] CONFIGURE_FLAGS += ['--enable-monodroid']
CONFIGURE_FLAGS += ['--with-btls-android-ndk-asm-workaround'] if android_new_ndk else [] CONFIGURE_FLAGS += ['--with-btls-android-ndk-asm-workaround']
CONFIGURE_FLAGS += [ CONFIGURE_FLAGS += [
'--with-btls-android-cmake-toolchain=%s/build/cmake/android.toolchain.cmake' % opts.android_ndk_root, '--with-btls-android-cmake-toolchain=%s/build/cmake/android.toolchain.cmake' % opts.android_ndk_root,
@ -524,7 +513,7 @@ def main(raw_args):
parser.add_argument('--android-ndk', default=android_ndk_default, help=default_help) parser.add_argument('--android-ndk', default=android_ndk_default, help=default_help)
# Default API version should be in sync with Godot's platform/android/detect.py. # Default API version should be in sync with Godot's platform/android/detect.py.
# Note that `get_api_version_or_min` will upgrade it to 21 for arm64v8 and x86_64. # Note that `get_api_version_or_min` will upgrade it to 21 for arm64v8 and x86_64.
parser.add_argument('--android-api-version', default='18', help=default_help) parser.add_argument('--android-api-version', default='19', help=default_help)
parser.add_argument('--android-cmake-version', default='autodetect', help=default_help) parser.add_argument('--android-cmake-version', default='autodetect', help=default_help)
cmd_utils.add_runtime_arguments(parser, default_help) cmd_utils.add_runtime_arguments(parser, default_help)