From 1da15a2389d667a9b76018f30439f1594e29c28f Mon Sep 17 00:00:00 2001 From: Jared Duke Date: Fri, 3 Feb 2023 13:18:52 -0800 Subject: Update host_bcp.sh script to use apex-info-list.xml Use the host-generated apex-info-list mapping to trace bootclasspath references to apex jars. This seems to be slightly more robust to host paths for both flattened and unflattened modules. Test: art/tools/compile-classes.sh Bar.java Bug: 161394143 Change-Id: I40f62fc1bde54b1303f5b85ab0604274d20ec046 --- tools/compile-jar.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'tools/compile-jar.py') diff --git a/tools/compile-jar.py b/tools/compile-jar.py index 56a07d5a61..d3484460ce 100755 --- a/tools/compile-jar.py +++ b/tools/compile-jar.py @@ -105,19 +105,17 @@ def get_bcp_runtime_args(additions, image, arch): "art/tools/host_bcp.sh", os.path.expandvars( "${{OUT}}/system/framework/oat/{}/services.odex".format(arch)), - "--use-first-dir" ] print("Running: {}".format(run_print(args))) print("=START=======================================") res = subprocess.run(args, capture_output=True, text=True) print("=END=========================================") if res.returncode != 0: - print("Falling back to com.android.art BCP") + print("Falling back to ART boot image: {}".format(res)) args = [ "art/tools/host_bcp.sh", os.path.expandvars( - "${{OUT}}/apex/com.android.art.debug/javalib/{}/boot.oat".format(arch)), - "--use-first-dir" + "${{OUT}}/apex/art_boot_images/javalib/{}/boot.oat".format(arch)), ] print("Running: {}".format(run_print(args))) print("=START=======================================") -- cgit v1.2.3-59-g8ed1b