mirror/The-Powder-Toy
1
0
Fork 0
mirror of https://github.com/The-Powder-Toy/The-Powder-Toy.git synced 2025-08-10 02:16:37 +02:00
Code Issues Projects Releases Wiki Activity

Propagate python3 program to the android build's meson config

Browse Source 
This should have been done in 9a785dc389.
This commit is contained in:
Tamás Bálint Misius
2024-12-17 14:33:17 +01:00
parent 653d43699e
commit c62f105c85
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
android/meson.build
View File

@@ -11,7 +11,6 @@ powder_jar_sources = configure_file(
subdir('res') subdir('res')
python3 = find_program('python3')
android_platform_jar = meson.get_external_property('android_platform_jar') android_platform_jar = meson.get_external_property('android_platform_jar')
java_runtime_jar = meson.get_external_property('java_runtime_jar') java_runtime_jar = meson.get_external_property('java_runtime_jar')
android_keystore = get_option('android_keystore') android_keystore = get_option('android_keystore')
@@ -20,7 +19,7 @@ powder_jar = custom_target(
'powder-jar', 'powder-jar',
output: app_exe + '.jar', output: app_exe + '.jar',
command: [ command: [
python3, python3_prog,
files('powder-jar.py'), files('powder-jar.py'),
find_program('javac'), find_program('javac'),
find_program('jar'), find_program('jar'),
@@ -40,7 +39,7 @@ unaligned_apk = custom_target(
output: app_exe + '.unaligned.apk', output: app_exe + '.unaligned.apk',
input: powder_sha, input: powder_sha,
command: [ command: [
python3, python3_prog,
files('build-apk.py'), files('build-apk.py'),
find_program('d8'), find_program('d8'),
find_program('aapt'), find_program('aapt'),
@@ -64,7 +63,7 @@ unsigned_apk = custom_target(
output: app_exe + '.unsigned.apk', output: app_exe + '.unsigned.apk',
input: unaligned_apk, input: unaligned_apk,
command: [ command: [
python3, python3_prog,
files('align-apk.py'), files('align-apk.py'),
find_program('zipalign'), find_program('zipalign'),
meson.project_build_root(), meson.project_build_root(),
@@ -77,7 +76,7 @@ signed_apk = custom_target(
output: app_exe + '.apk', output: app_exe + '.apk',
input: unsigned_apk, input: unsigned_apk,
command: [ command: [
python3, python3_prog,
files('sign-apk.py'), files('sign-apk.py'),
find_program('apksigner'), find_program('apksigner'),
meson.project_build_root(), meson.project_build_root(),
@@ -93,13 +92,13 @@ if adb.found()
'install-apk', 'install-apk',
input: signed_apk, input: signed_apk,
output: 'install-apk', output: 'install-apk',
command: [ python3, files('install-apk.py'), adb, meson.project_build_root(), '@OUTPUT@', '@INPUT@' ], command: [ python3_prog, files('install-apk.py'), adb, meson.project_build_root(), '@OUTPUT@', '@INPUT@' ],
) )
custom_target( custom_target(
'run-apk', 'run-apk',
input: [ signed_apk, install_apk ], input: [ signed_apk, install_apk ],
build_always_stale: true, build_always_stale: true,
output: 'run-apk', output: 'run-apk',
command: [ python3, files('run-apk.py'), adb, meson.project_build_root(), '@OUTPUT@', '@INPUT0@', app_id ], command: [ python3_prog, files('run-apk.py'), adb, meson.project_build_root(), '@OUTPUT@', '@INPUT0@', app_id ],
) )
endif endif