From 5a2267bdb4e6d4eefec51ac0f7b616550f567b88 Mon Sep 17 00:00:00 2001 From: Colin Edwards Date: Wed, 17 Jan 2024 23:36:49 -0600 Subject: [PATCH 1/2] Android: Look for license to verify Android SDK folder The `android` command was depricated and has been removed from new installs of the sdk The license file existing is about all that is stable between different sdk versions and cli vs Android studio installs --- android/build.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/build.py b/android/build.py index 8a95c13b1..9163268b5 100755 --- a/android/build.py +++ b/android/build.py @@ -13,7 +13,7 @@ ndk_path = sys.argv[2] android_abi = sys.argv[3] configure_args = sys.argv[4:] -if not os.path.isfile(os.path.join(sdk_path, 'tools', 'android')): +if not os.path.isfile(os.path.join(sdk_path, 'licenses', 'android-sdk-license')): print("SDK not found in", sdk_path, file=sys.stderr) sys.exit(1) From 04ba7eb9878964b41a6609d26dd3d0338e795aa2 Mon Sep 17 00:00:00 2001 From: Colin Edwards Date: Wed, 17 Jan 2024 23:55:01 -0600 Subject: [PATCH 2/2] android: Use build tools and SDK 34 The gradle config for the app is already compiling with the 34 SDK so lets bump it for the bridge build too --- android/meson.build | 4 ++-- doc/user.rst | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/android/meson.build b/android/meson.build index a9f88ec4b..89f7b1b73 100644 --- a/android/meson.build +++ b/android/meson.build @@ -5,8 +5,8 @@ android_ndk = get_option('android_ndk') android_sdk = get_option('android_sdk') android_abi = get_option('android_abi') -android_sdk_build_tools_version = '29.0.3' -android_sdk_platform = 'android-29' +android_sdk_build_tools_version = '34.0.0' +android_sdk_platform = 'android-34' android_build_tools_dir = join_paths(android_sdk, 'build-tools', android_sdk_build_tools_version) android_sdk_platform_dir = join_paths(android_sdk, 'platforms', android_sdk_platform) diff --git a/doc/user.rst b/doc/user.rst index 80da9dfda..6dcd66abe 100644 --- a/doc/user.rst +++ b/doc/user.rst @@ -196,7 +196,7 @@ Compiling for Android You need: -* Android SDK (sdk platform 29, build tools 29.0.3) +* Android SDK (sdk platform 34, build tools 34.0.0) * `Android NDK r26b `_ * `Meson 0.56.0 `__ and `Ninja `__