commit 246e72861418364513e10cd5df73631f2c712097
author Treehugger Robot <treehugger-gerrit@google.com> Wed Jan 30 04:26:04 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jan 30 04:26:04 2019 +0000
tree bbe502ece468e10f5acb7c67065fbd35ece2f560
parent 731de8903e495fdc61576dac4058a107688abcf4
parent 9e1fb1b3bde081d970dd6b9f29feddfbbdcc5d1a

Merge "Use DEXPREOPT_BOOTCLASSPATH_DEX_FILES to build boot_profile_jars.zip"

core/dex_preopt.mk

diff --git a/core/dex_preopt.mk b/core/dex_preopt.mk
index 60fd8db..f102662 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,$(DEXPREOPT_BOOT_JARS_MODULES),$(PRODUCT_OUT)/system/framework/$(m).jar) \
+  $(DEXPREOPT_BOOTCLASSPATH_DEX_FILES) \
   $(foreach m,$(PRODUCT_SYSTEM_SERVER_JARS),$(PRODUCT_OUT)/system/framework/$(m).jar)
 
 $(boot_profile_jars_zip): PRIVATE_JARS := $(all_boot_jars)