aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Geoffray2019-01-09 06:37:15 -0600
committerGerrit Code Review2019-01-09 06:37:15 -0600
commit9ce12752dc6f0fccce3c7e07d3cba9f9491e9212 (patch)
tree5b868662642371dd8f4300665e7193a8977df08c
parentfe9f373e109ed3bf19860262eeedb035b21cff23 (diff)
parent3266d6ef22d93da317abd3f28582fa489c92bb75 (diff)
downloadplatform-build-9ce12752dc6f0fccce3c7e07d3cba9f9491e9212.tar.gz
platform-build-9ce12752dc6f0fccce3c7e07d3cba9f9491e9212.tar.xz
platform-build-9ce12752dc6f0fccce3c7e07d3cba9f9491e9212.zip
Merge "Preopt: Pass -Xbootclasspath: arg to dex2oat."
-rw-r--r--core/dex_preopt.mk2
-rw-r--r--core/dex_preopt_config.mk11
2 files changed, 9 insertions, 4 deletions
diff --git a/core/dex_preopt.mk b/core/dex_preopt.mk
index 59346ed35..4d7d11cc6 100644
--- a/core/dex_preopt.mk
+++ b/core/dex_preopt.mk
@@ -88,7 +88,7 @@ $(INTERNAL_PLATFORM_HIDDENAPI_PRIVATE_LIST): $(HIDDENAPI) $(HIDDENAPI_STUBS) \
88ifeq ($(PRODUCT_DIST_BOOT_AND_SYSTEM_JARS),true) 88ifeq ($(PRODUCT_DIST_BOOT_AND_SYSTEM_JARS),true)
89boot_profile_jars_zip := $(PRODUCT_OUT)/boot_profile_jars.zip 89boot_profile_jars_zip := $(PRODUCT_OUT)/boot_profile_jars.zip
90all_boot_jars := \ 90all_boot_jars := \
91 $(foreach m,$(DEXPREOPT_BOOT_JARS_MODULES),$(PRODUCT_OUT)/system/framework/$(m).jar) \ 91 $(foreach m,$(PRODUCT_BOOT_JARS),$(PRODUCT_OUT)/system/framework/$(m).jar) \
92 $(foreach m,$(PRODUCT_SYSTEM_SERVER_JARS),$(PRODUCT_OUT)/system/framework/$(m).jar) 92 $(foreach m,$(PRODUCT_SYSTEM_SERVER_JARS),$(PRODUCT_OUT)/system/framework/$(m).jar)
93 93
94$(boot_profile_jars_zip): PRIVATE_JARS := $(all_boot_jars) 94$(boot_profile_jars_zip): PRIVATE_JARS := $(all_boot_jars)
diff --git a/core/dex_preopt_config.mk b/core/dex_preopt_config.mk
index cc456897a..0793516b2 100644
--- a/core/dex_preopt_config.mk
+++ b/core/dex_preopt_config.mk
@@ -1,9 +1,9 @@
1DEX_PREOPT_CONFIG := $(PRODUCT_OUT)/dexpreopt.config 1DEX_PREOPT_CONFIG := $(PRODUCT_OUT)/dexpreopt.config
2 2
3# list of boot classpath jars for dexpreopt 3# list of boot classpath jars for dexpreopt
4DEXPREOPT_BOOT_JARS := $(subst $(space),:,$(PRODUCT_BOOT_JARS))
5DEXPREOPT_BOOT_JARS_MODULES := $(PRODUCT_BOOT_JARS) 4DEXPREOPT_BOOT_JARS_MODULES := $(PRODUCT_BOOT_JARS)
6PRODUCT_BOOTCLASSPATH := $(subst $(space),:,$(foreach m,$(DEXPREOPT_BOOT_JARS_MODULES),/system/framework/$(m).jar)) 5PRODUCT_BOOTCLASSPATH_JARS := $(strip $(DEXPREOPT_BOOT_JARS_MODULES))
6PRODUCT_BOOTCLASSPATH := $(subst $(space),:,$(foreach m,$(PRODUCT_BOOTCLASSPATH_JARS),/system/framework/$(m).jar))
7 7
8PRODUCT_SYSTEM_SERVER_CLASSPATH := $(subst $(space),:,$(foreach m,$(PRODUCT_SYSTEM_SERVER_JARS),/system/framework/$(m).jar)) 8PRODUCT_SYSTEM_SERVER_CLASSPATH := $(subst $(space),:,$(foreach m,$(PRODUCT_SYSTEM_SERVER_JARS),/system/framework/$(m).jar))
9 9
@@ -13,6 +13,9 @@ DEXPREOPT_PRODUCT_DIR := $(patsubst $(DEXPREOPT_BUILD_DIR)/%,%,$(DEXPREOPT_PRODU
13DEXPREOPT_BOOT_JAR_DIR := system/framework 13DEXPREOPT_BOOT_JAR_DIR := system/framework
14DEXPREOPT_BOOT_JAR_DIR_FULL_PATH := $(DEXPREOPT_PRODUCT_DIR_FULL_PATH)/$(DEXPREOPT_BOOT_JAR_DIR) 14DEXPREOPT_BOOT_JAR_DIR_FULL_PATH := $(DEXPREOPT_PRODUCT_DIR_FULL_PATH)/$(DEXPREOPT_BOOT_JAR_DIR)
15 15
16DEXPREOPT_BOOTCLASSPATH_DEX_LOCATIONS := $(foreach m,$(PRODUCT_BOOTCLASSPATH_JARS),/$(DEXPREOPT_BOOT_JAR_DIR)/$(m).jar)
17DEXPREOPT_BOOTCLASSPATH_DEX_FILES := $(foreach jar,$(DEXPREOPT_BOOTCLASSPATH_DEX_LOCATIONS),$(PRODUCT_OUT)$(jar))
18
16DEFAULT_DEX_PREOPT_BUILT_IMAGE_LOCATION := $(DEXPREOPT_BOOT_JAR_DIR_FULL_PATH)/boot.art 19DEFAULT_DEX_PREOPT_BUILT_IMAGE_LOCATION := $(DEXPREOPT_BOOT_JAR_DIR_FULL_PATH)/boot.art
17DEFAULT_DEX_PREOPT_BUILT_IMAGE_FILENAME := $(DEXPREOPT_BOOT_JAR_DIR_FULL_PATH)/$(DEX2OAT_TARGET_ARCH)/boot.art 20DEFAULT_DEX_PREOPT_BUILT_IMAGE_FILENAME := $(DEXPREOPT_BOOT_JAR_DIR_FULL_PATH)/$(DEX2OAT_TARGET_ARCH)/boot.art
18 21
@@ -112,7 +115,9 @@ ifeq ($(WRITE_SOONG_VARIABLES),true)
112 $(call add_json_bool, HasSystemOther, $(BOARD_USES_SYSTEM_OTHER_ODEX)) 115 $(call add_json_bool, HasSystemOther, $(BOARD_USES_SYSTEM_OTHER_ODEX))
113 $(call add_json_list, PatternsOnSystemOther, $(SYSTEM_OTHER_ODEX_FILTER)) 116 $(call add_json_list, PatternsOnSystemOther, $(SYSTEM_OTHER_ODEX_FILTER))
114 $(call add_json_bool, DisableGenerateProfile, $(filter false,$(WITH_DEX_PREOPT_GENERATE_PROFILE))) 117 $(call add_json_bool, DisableGenerateProfile, $(filter false,$(WITH_DEX_PREOPT_GENERATE_PROFILE)))
115 $(call add_json_list, BootJars, $(DEXPREOPT_BOOT_JARS_MODULES)) 118 $(call add_json_list, PreoptBootClassPathDexFiles, $(DEXPREOPT_BOOTCLASSPATH_DEX_FILES))
119 $(call add_json_list, PreoptBootClassPathDexLocations, $(DEXPREOPT_BOOTCLASSPATH_DEX_LOCATIONS))
120 $(call add_json_list, BootJars, $(PRODUCT_BOOT_JARS))
116 $(call add_json_list, SystemServerJars, $(PRODUCT_SYSTEM_SERVER_JARS)) 121 $(call add_json_list, SystemServerJars, $(PRODUCT_SYSTEM_SERVER_JARS))
117 $(call add_json_list, SystemServerApps, $(PRODUCT_SYSTEM_SERVER_APPS)) 122 $(call add_json_list, SystemServerApps, $(PRODUCT_SYSTEM_SERVER_APPS))
118 $(call add_json_list, SpeedApps, $(PRODUCT_DEXPREOPT_SPEED_APPS)) 123 $(call add_json_list, SpeedApps, $(PRODUCT_DEXPREOPT_SPEED_APPS))