commit 7307de5e0cbdeeb76f467861a409e74932ef8508
author Colin Cross <ccross@android.com> Tue Oct 02 01:55:47 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Oct 02 01:55:47 2018 +0000
tree bb78cc9205b94947bf880386fbcc9929753e8340
parent e70d7491907816cd9b32388b98ec06701d64254d
parent 8b6c94c74462464a77cc66c9782f539b273dda90

Merge changes I9e73c0b8,Iac5c4327,Idf6fbc94

* changes:
  Disable sdk_addon for mmm
  Use soong_zip for platform.zip
  Use soong_zip for otatools.zip and otacerts.zip

core/dex_preopt.mk

diff --git a/core/dex_preopt.mk b/core/dex_preopt.mk
index aa24c20..1527047 100644
--- a/core/dex_preopt.mk
+++ b/core/dex_preopt.mk
@@ -159,7 +159,7 @@
 $(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)