meson.build: run dx on the whole jar

This is now possible without ARSCLib

Also remove --verbose flag
This commit is contained in:
Julian Winkler
2024-05-23 23:20:07 +02:00
parent b25545c3c0
commit d4086fdb90

View File

@@ -157,16 +157,14 @@ executable('android-translation-layer', [
], ],
install_rpath: get_option('prefix') / get_option('libdir') / 'art:' + get_option('prefix') / get_option('libdir') / 'java/dex/android_translation_layer/natives') install_rpath: get_option('prefix') / get_option('libdir') / 'art:' + get_option('prefix') / get_option('libdir') / 'java/dex/android_translation_layer/natives')
# hax.dex (named as classes.dex so it works inside a jar) # hax.jar
subdir('src/api-impl') subdir('src/api-impl')
hax_dex = custom_target('hax.dex', build_by_default: true, input: [hax_jar], output: ['classes.dex'],
command: ['dx', '--verbose', '--dex', '--output='+join_paths(builddir_base, 'classes.dex'), hax_jar.full_path()])
# api-impl.jar # api-impl.jar
custom_target('api-impl.jar', build_by_default: true, input: [hax_dex], output: ['api-impl.jar'], custom_target('api-impl.jar', build_by_default: true, input: [hax_jar], output: ['api-impl.jar'],
install: true, install: true,
install_dir : get_option('libdir') / 'java/dex/android_translation_layer', install_dir : get_option('libdir') / 'java/dex/android_translation_layer',
command: ['jar', '-cvf', join_paths(builddir_base, 'api-impl.jar'), '-C', builddir_base, hax_dex]) command: ['dx', '--dex', '--output='+join_paths(builddir_base, 'api-impl.jar'), hax_jar.full_path()])
#framework-res.apk #framework-res.apk
subdir('res') subdir('res')