oysteikt
/
mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'sdkcheck' of https://github.com/DDRBoxman/MPD

This commit is contained in:
Max Kellermann 2024-01-18 09:59:17 +01:00
parent c93fc161dc 04ba7eb987
commit 6352d1b1ca
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
android/build.py
View File

@ -13,7 +13,7 @@ ndk_path = sys.argv[2]
android_abi = sys.argv[3] android_abi = sys.argv[3]
configure_args = sys.argv[4:] 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) print("SDK not found in", sdk_path, file=sys.stderr)
sys.exit(1) sys.exit(1)

4
android/meson.build
View File

@ -5,8 +5,8 @@ android_ndk = get_option('android_ndk')
android_sdk = get_option('android_sdk') android_sdk = get_option('android_sdk')
android_abi = get_option('android_abi') android_abi = get_option('android_abi')
android_sdk_build_tools_version = '29.0.3' android_sdk_build_tools_version = '34.0.0'
android_sdk_platform = 'android-29' android_sdk_platform = 'android-34'
android_build_tools_dir = join_paths(android_sdk, 'build-tools', android_sdk_build_tools_version) 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) android_sdk_platform_dir = join_paths(android_sdk, 'platforms', android_sdk_platform)

2
doc/user.rst
View File

@ -196,7 +196,7 @@ Compiling for Android
You need: 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 <https://developer.android.com/ndk/downloads>`_ * `Android NDK r26b <https://developer.android.com/ndk/downloads>`_
* `Meson 0.56.0 <http://mesonbuild.com/>`__ and `Ninja * `Meson 0.56.0 <http://mesonbuild.com/>`__ and `Ninja
<https://ninja-build.org/>`__ <https://ninja-build.org/>`__