commit 9448754144e407576462df6faa1dfe9e9346506f
author Jiakai Zhang <jiakaiz@google.com> Mon Jun 12 16:22:39 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jun 12 16:22:39 2023 +0000
tree 1e4e6dcb8317683fe3122c21c55cc9652e1997e1
parent d97f8505ae3ed08cfde21d88e0ac54b039392962
parent 34914f620bcc0339104ef0360f6a30492f407409

Merge "Avoid using soong_zip's "-e" flag for boot.zip."

core/dex_preopt.mk

diff --git a/core/dex_preopt.mk b/core/dex_preopt.mk
index af5ff9d..86ca729 100644
--- a/core/dex_preopt.mk
+++ b/core/dex_preopt.mk
@@ -95,7 +95,7 @@
 boot_images := $(subst :,$(space),$(DEXPREOPT_IMAGE_LOCATIONS_ON_DEVICE$(DEXPREOPT_INFIX)))
 boot_image_arg := $(subst $(space),:,$(patsubst /%,%,$(boot_images)))
 
-boot_zip_metadata_txt := $(boot_zip).METADATA.txt
+boot_zip_metadata_txt := $(dir $(boot_zip))boot_zip/METADATA.txt
 $(boot_zip_metadata_txt):
 	rm -f $@
 	echo "booclasspath = $(booclasspath_arg)" >> $@
@@ -112,7 +112,7 @@
 	$(SOONG_ZIP) -o $@.tmp \
 	  -C $(dir $(firstword $(PRIVATE_BOOTCLASSPATH_JARS)))/.. $(addprefix -f ,$(PRIVATE_BOOTCLASSPATH_JARS)) \
 	  -C $(PRODUCT_OUT) $(addprefix -f ,$(PRIVATE_SYSTEM_SERVER_JARS)) \
-	  -e METADATA.txt -f $(boot_zip_metadata_txt)
+	  -j -f $(boot_zip_metadata_txt)
 	$(MERGE_ZIPS) $@ $@.tmp $(DEXPREOPT_IMAGE_ZIP_boot) $(DEXPREOPT_IMAGE_ZIP_art) $(DEXPREOPT_IMAGE_ZIP_mainline)
 	rm -f $@.tmp