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

android: find apksigner in build tools folder

This commit is contained in:
Colin Edwards 2023-12-13 10:35:52 -06:00
parent a6024f476a
commit 9059c6c657
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
android/apk/meson.build
View File

@ -29,7 +29,7 @@ if get_option('android_debug_keystore') != ''
output: 'mpd-debug.apk', output: 'mpd-debug.apk',
input: aligned_apk, input: aligned_apk,
command: [ command: [
apksigner, 'sign', android_apksigner, 'sign',
'--in', '@INPUT@', '--in', '@INPUT@',
'--out', '@OUTPUT@', '--out', '@OUTPUT@',
'--debuggable-apk-permitted', '--debuggable-apk-permitted',
@ -47,7 +47,7 @@ if get_option('android_keystore') != '' and get_option('android_keyalias') != ''
output: 'mpd.apk', output: 'mpd.apk',
input: aligned_apk, input: aligned_apk,
command: [ command: [
apksigner, 'sign', android_apksigner, 'sign',
'--in', '@INPUT@', '--in', '@INPUT@',
'--out', '@OUTPUT@', '--out', '@OUTPUT@',
'-ks', get_option('android_keystore'), '-ks', get_option('android_keystore'),

2
android/meson.build
View File

@ -15,9 +15,9 @@ android_aidl = join_paths(android_build_tools_dir, 'aidl')
android_aapt = join_paths(android_build_tools_dir, 'aapt') android_aapt = join_paths(android_build_tools_dir, 'aapt')
android_dx = join_paths(android_build_tools_dir, 'dx') android_dx = join_paths(android_build_tools_dir, 'dx')
android_zipalign = join_paths(android_build_tools_dir, 'zipalign') android_zipalign = join_paths(android_build_tools_dir, 'zipalign')
android_apksigner = join_paths(android_build_tools_dir, 'apksigner')
javac = find_program('javac') javac = find_program('javac')
apksigner = find_program('apksigner')
rsvg_convert = find_program('rsvg-convert') rsvg_convert = find_program('rsvg-convert')
convert = find_program('convert') convert = find_program('convert')
zip = find_program('zip') zip = find_program('zip')