commit ba3e26d5da097fcec495200c96fade9ee1147ede
author Calin Juravle <calin@google.com> Thu Jan 24 07:56:37 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jan 24 07:56:37 2019 +0000
tree ecc4395a04edac759531d26260b75cebf5e7fe67
parent 5fe50948da4a8a60f97ea933cd04d71fdaa0d858
parent b741d1cfa9b880e2a872e266d2c411e9d93ac1c1

Merge "Replace PRODUCT_BOOT_JARS with DEXPREOPT_BOOT_JARS_MODULES for nopreloads"

core/dex_preopt.mk

diff --git a/core/dex_preopt.mk b/core/dex_preopt.mk
index 7e38ae8..60fd8db 100644
--- a/core/dex_preopt.mk
+++ b/core/dex_preopt.mk
@@ -92,7 +92,7 @@
 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)