From 1a81e372b5db1a811c03394fef669cf98e40adee Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Mon, 1 Oct 2018 10:30:04 -0700 Subject: [PATCH] Fix boot_profile_jars.zip soong_zip was previously ignoring trailing command line arguments, but now they are an error. boot_profile_jars.zip had all its files as trailing arguments instead of as -f flags, previously resulting in an empty zip, but now causing an error. Fix the arguments to use -f before each file. Test: m PRODUCT_DIST_BOOT_AND_SYSTEM_JARS=true out/target/product/sailfish/boot_profile_jars.zip Change-Id: I8ac4aa4fbca812b8aa2ff9526e1ed7c769dd8420 --- core/dex_preopt.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/dex_preopt.mk b/core/dex_preopt.mk index aa24c20f01..15270478f0 100644 --- a/core/dex_preopt.mk +++ b/core/dex_preopt.mk @@ -159,7 +159,7 @@ $(boot_profile_jars_zip): PRIVATE_JARS := $(all_boot_jars) $(boot_profile_jars_zip): $(all_boot_jars) $(SOONG_ZIP) echo "Create boot profiles package: $@" rm -f $@ - $(SOONG_ZIP) -o $@ -C $(PRODUCT_OUT) $(PRIVATE_JARS) + $(SOONG_ZIP) -o $@ -C $(PRODUCT_OUT) $(addprefix -f ,$(PRIVATE_JARS)) droidcore: $(boot_profile_jars_zip)