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

android/meson.build: use apksigner instead of jarsigner

Browse Source 
This is required for targetSdkVersion=30.

apksigner requires running zipalign first.
This commit is contained in:
Max Kellermann 2022-07-12 11:38:12 +02:00
parent 1f28790476
commit 2183f0553c
2 changed files with 27 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
android/apk/meson.build
View File

@ -12,18 +12,30 @@ unsigned_apk = custom_target(
], ],
) )
aligned_apk = custom_target(
'mpd-aligned.apk',
output: 'mpd-aligned.apk',
input: unsigned_apk,
command: [
android_zipalign,
'-f', '4',
'@INPUT@', '@OUTPUT@',
],
)
if get_option('android_debug_keystore') != '' if get_option('android_debug_keystore') != ''
debug_apk = custom_target( debug_apk = custom_target(
'mpd-debug.apk', 'mpd-debug.apk',
output: 'mpd-debug.apk', output: 'mpd-debug.apk',
input: unsigned_apk, input: aligned_apk,
command: [ command: [
jarsigner, apksigner, 'sign',
'-keystore', get_option('android_debug_keystore'), '--in', '@INPUT@',
'-storepass', 'android', '--out', '@OUTPUT@',
'-signedjar', '@OUTPUT@', '--debuggable-apk-permitted',
'@INPUT@', '-ks', get_option('android_debug_keystore'),
'androiddebugkey', '--ks-key-alias', 'androiddebugkey',
'--ks-pass', 'pass:android',
], ],
build_by_default: true build_by_default: true
) )
@ -31,29 +43,16 @@ endif
if get_option('android_keystore') != '' and get_option('android_keyalias') != '' and get_option('android_keypass') != '' if get_option('android_keystore') != '' and get_option('android_keyalias') != '' and get_option('android_keypass') != ''
unaligned_apk = custom_target( unaligned_apk = custom_target(
'mpd-unaligned.apk',
output: 'mpd-unaligned.apk',
input: unsigned_apk,
command: [
jarsigner,
'-digestalg', 'SHA1', '-sigalg', 'MD5withRSA',
'-keystore', get_option('android_keystore'),
'-storepass', get_option('android_keypass'),
'-signedjar', '@OUTPUT@',
'@INPUT@',
get_option('android_keyalias'),
],
)
apk = custom_target(
'mpd.apk', 'mpd.apk',
output: 'mpd.apk', output: 'mpd.apk',
input: unaligned_apk, input: aligned_apk,
command: [ command: [
android_zipalign, apksigner, 'sign',
'-f', '4', '--in', '@INPUT@',
'@INPUT@', '@OUTPUT@', '--out', '@OUTPUT@',
'-ks', get_option('android_keystore'),
'--ks-key-alias', get_option('android_keyalias'),
'--ks-pass', 'pass:' + get_option('android_keypass'),
], ],
build_by_default: true
) )
endif endif

2
android/meson.build
View File

@ -17,7 +17,7 @@ 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')
javac = find_program('javac') javac = find_program('javac')
jarsigner = find_program('jarsigner') 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')