commit e77717f25d8658b299b517118c7455843395dbe0
author Calin Juravle <calin@google.com> Tue Jan 29 20:41:10 2019 -0800
committer android-build-merger <android-build-merger@google.com> Tue Jan 29 20:41:10 2019 -0800
tree 554468a62705313d5b79aa43ae84611c770e4704
parent 8f77927d09622f165f0724c6986c49c355db8338
parent 4f819cda1bcf8349ac80b5acfa7f09f702a060fc

Merge "Use DEXPREOPT_BOOTCLASSPATH_DEX_FILES to build boot_profile_jars.zip" am: 246e728614
am: 4f819cda1b

Change-Id: I712aac26d221d578477eb6d37f73894fb3dd4032

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)