From d4086fdb904b8853582b0fe65e9a262f767e4f5c Mon Sep 17 00:00:00 2001 From: Julian Winkler Date: Thu, 23 May 2024 23:20:07 +0200 Subject: [PATCH] meson.build: run dx on the whole jar This is now possible without ARSCLib Also remove --verbose flag --- meson.build | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/meson.build b/meson.build index d88d0b5c..e8132760 100644 --- a/meson.build +++ b/meson.build @@ -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') -# hax.dex (named as classes.dex so it works inside a jar) +# hax.jar 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 -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_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 subdir('res')