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

Commit 4d5f5ff9 authored by Cyan Hsieh's avatar Cyan Hsieh
Browse files

Revert "Add the entire boot image to boot.zip" 

This reverts commit c0ed5e7c.

Reason for revert: this patch cause build breakage on aosp-master-throttled (aosp_qemu_trusty-userdebug)

Bug: 130376456
Change-Id: Iab03d21219674691bd8bf6b2e5004508ebb862b9
parent c0ed5e7c

core/dex_preopt.mk

+9 −10
Original line number Diff line number Diff line
@@ -22,20 +22,19 @@ DEFAULT_DEX_PREOPT_INSTALLED_IMAGE := 
$(TARGET_2ND_ARCH_VAR_PREFIX)DEFAULT_DEX_PREOPT_INSTALLED_IMAGE :=

$(foreach my_boot_image_name,$(DEXPREOPT_IMAGE_NAMES),$(eval include $(BUILD_SYSTEM)/dex_preopt_libart.mk))



boot_zip := $(PRODUCT_OUT)/boot.zip

boot_profile_jars_zip := $(PRODUCT_OUT)/boot_profile_jars.zip

bootclasspath_jars := $(DEXPREOPT_BOOTCLASSPATH_DEX_FILES)

system_server_jars := $(foreach m,$(PRODUCT_SYSTEM_SERVER_JARS),$(PRODUCT_OUT)/system/framework/$(m).jar)



$(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)

	@echo "Create boot package: $@"

$(boot_profile_jars_zip): PRIVATE_BOOTCLASSPATH_JARS := $(bootclasspath_jars)

$(boot_profile_jars_zip): PRIVATE_SYSTEM_SERVER_JARS := $(system_server_jars)

$(boot_profile_jars_zip): $(bootclasspath_jars) $(system_server_jars) $(SOONG_ZIP)

	@echo "Create boot profiles package: $@"

	rm -f $@

	$(SOONG_ZIP) -o $@.tmp \

	$(SOONG_ZIP) -o $@ \

	  -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)

	rm -f $@.tmp



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



ifeq ($(PRODUCT_DIST_BOOT_AND_SYSTEM_JARS),true)

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

endif