Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 64daf2e0 authored by Calin Juravle's avatar Calin Juravle Committed by Gerrit Code Review
Browse files

Merge "Add art dexpreopt to boot.zip archive"

parents dc0b50b2 abdea218

core/dex_preopt.mk

+2 −2
Original line number Diff line number Diff line
@@ -34,13 +34,13 @@ system_server_jars := $(foreach m,$(PRODUCT_SYSTEM_SERVER_JARS),$(PRODUCT_OUT)/s 


$(boot_zip): PRIVATE_BOOTCLASSPATH_JARS := $(bootclasspath_jars)

$(boot_zip): PRIVATE_SYSTEM_SERVER_JARS := $(system_server_jars)

$(boot_zip): $(bootclasspath_jars) $(system_server_jars) $(SOONG_ZIP) $(MERGE_ZIPS) $(DEXPREOPT_IMAGE_ZIP_boot)

$(boot_zip): $(bootclasspath_jars) $(system_server_jars) $(SOONG_ZIP) $(MERGE_ZIPS) $(DEXPREOPT_IMAGE_ZIP_boot) $(DEXPREOPT_IMAGE_ZIP_art)

	@echo "Create boot package: $@"

	rm -f $@

	$(SOONG_ZIP) -o $@.tmp \

	  -C $(dir $(firstword $(PRIVATE_BOOTCLASSPATH_JARS)))/.. $(addprefix -f ,$(PRIVATE_BOOTCLASSPATH_JARS)) \

	  -C $(PRODUCT_OUT) $(addprefix -f ,$(PRIVATE_SYSTEM_SERVER_JARS))

	$(MERGE_ZIPS) $@ $@.tmp $(DEXPREOPT_IMAGE_ZIP_boot)

	$(MERGE_ZIPS) $@ $@.tmp $(DEXPREOPT_IMAGE_ZIP_boot) $(DEXPREOPT_IMAGE_ZIP_art)

	rm -f $@.tmp



$(call dist-for-goals, droidcore, $(boot_zip))