From 9059c6c657e2ed6aab3f865717c2179bf3a58948 Mon Sep 17 00:00:00 2001 From: Colin Edwards Date: Wed, 13 Dec 2023 10:35:52 -0600 Subject: [PATCH] android: find apksigner in build tools folder --- android/apk/meson.build | 4 ++-- android/meson.build | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/android/apk/meson.build b/android/apk/meson.build index 1695ef502..0ee395852 100644 --- a/android/apk/meson.build +++ b/android/apk/meson.build @@ -29,7 +29,7 @@ if get_option('android_debug_keystore') != '' output: 'mpd-debug.apk', input: aligned_apk, command: [ - apksigner, 'sign', + android_apksigner, 'sign', '--in', '@INPUT@', '--out', '@OUTPUT@', '--debuggable-apk-permitted', @@ -47,7 +47,7 @@ if get_option('android_keystore') != '' and get_option('android_keyalias') != '' output: 'mpd.apk', input: aligned_apk, command: [ - apksigner, 'sign', + android_apksigner, 'sign', '--in', '@INPUT@', '--out', '@OUTPUT@', '-ks', get_option('android_keystore'), diff --git a/android/meson.build b/android/meson.build index 75134e942..66adb38b0 100644 --- a/android/meson.build +++ b/android/meson.build @@ -15,9 +15,9 @@ android_aidl = join_paths(android_build_tools_dir, 'aidl') android_aapt = join_paths(android_build_tools_dir, 'aapt') android_dx = join_paths(android_build_tools_dir, 'dx') android_zipalign = join_paths(android_build_tools_dir, 'zipalign') +android_apksigner = join_paths(android_build_tools_dir, 'apksigner') javac = find_program('javac') -apksigner = find_program('apksigner') rsvg_convert = find_program('rsvg-convert') convert = find_program('convert') zip = find_program('zip')