From b741d1cfa9b880e2a872e266d2c411e9d93ac1c1 Mon Sep 17 00:00:00 2001 From: Calin Juravle Date: Wed, 23 Jan 2019 18:06:06 -0800 Subject: [PATCH] Replace PRODUCT_BOOT_JARS with DEXPREOPT_BOOT_JARS_MODULES for nopreloads boot_profile_jars.zip is used to process the boot image profile (by filtering out data that does not belong to the boot classpath). We only need the jars that are actually preloaded, and not the ones which are updatable. Test: launch taimen_nopreload-userdebug; m Bug: 123313750 Change-Id: I630f78dda3d9b38aac04b0f364b25fbcda4e26a3 --- 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 ab06375a29..01c98e1cc2 100644 --- a/core/dex_preopt.mk +++ b/core/dex_preopt.mk @@ -94,7 +94,7 @@ $(INTERNAL_PLATFORM_HIDDENAPI_GREYLIST_METADATA): PRIVATE_METADATA_INPUTS := $(S ifeq ($(PRODUCT_DIST_BOOT_AND_SYSTEM_JARS),true) boot_profile_jars_zip := $(PRODUCT_OUT)/boot_profile_jars.zip all_boot_jars := \ - $(foreach m,$(PRODUCT_BOOT_JARS),$(PRODUCT_OUT)/system/framework/$(m).jar) \ + $(foreach m,$(DEXPREOPT_BOOT_JARS_MODULES),$(PRODUCT_OUT)/system/framework/$(m).jar) \ $(foreach m,$(PRODUCT_SYSTEM_SERVER_JARS),$(PRODUCT_OUT)/system/framework/$(m).jar) $(boot_profile_jars_zip): PRIVATE_JARS := $(all_boot_jars)