diff options
Diffstat (limited to 'core/dex_preopt_config.mk')
-rw-r--r-- | core/dex_preopt_config.mk | 11 |
1 files changed, 8 insertions, 3 deletions
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 @@ | |||
1 | DEX_PREOPT_CONFIG := $(PRODUCT_OUT)/dexpreopt.config | 1 | DEX_PREOPT_CONFIG := $(PRODUCT_OUT)/dexpreopt.config |
2 | 2 | ||
3 | # list of boot classpath jars for dexpreopt | 3 | # list of boot classpath jars for dexpreopt |
4 | DEXPREOPT_BOOT_JARS := $(subst $(space),:,$(PRODUCT_BOOT_JARS)) | ||
5 | DEXPREOPT_BOOT_JARS_MODULES := $(PRODUCT_BOOT_JARS) | 4 | DEXPREOPT_BOOT_JARS_MODULES := $(PRODUCT_BOOT_JARS) |
6 | PRODUCT_BOOTCLASSPATH := $(subst $(space),:,$(foreach m,$(DEXPREOPT_BOOT_JARS_MODULES),/system/framework/$(m).jar)) | 5 | PRODUCT_BOOTCLASSPATH_JARS := $(strip $(DEXPREOPT_BOOT_JARS_MODULES)) |
6 | PRODUCT_BOOTCLASSPATH := $(subst $(space),:,$(foreach m,$(PRODUCT_BOOTCLASSPATH_JARS),/system/framework/$(m).jar)) | ||
7 | 7 | ||
8 | PRODUCT_SYSTEM_SERVER_CLASSPATH := $(subst $(space),:,$(foreach m,$(PRODUCT_SYSTEM_SERVER_JARS),/system/framework/$(m).jar)) | 8 | PRODUCT_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 | |||
13 | DEXPREOPT_BOOT_JAR_DIR := system/framework | 13 | DEXPREOPT_BOOT_JAR_DIR := system/framework |
14 | DEXPREOPT_BOOT_JAR_DIR_FULL_PATH := $(DEXPREOPT_PRODUCT_DIR_FULL_PATH)/$(DEXPREOPT_BOOT_JAR_DIR) | 14 | DEXPREOPT_BOOT_JAR_DIR_FULL_PATH := $(DEXPREOPT_PRODUCT_DIR_FULL_PATH)/$(DEXPREOPT_BOOT_JAR_DIR) |
15 | 15 | ||
16 | DEXPREOPT_BOOTCLASSPATH_DEX_LOCATIONS := $(foreach m,$(PRODUCT_BOOTCLASSPATH_JARS),/$(DEXPREOPT_BOOT_JAR_DIR)/$(m).jar) | ||
17 | DEXPREOPT_BOOTCLASSPATH_DEX_FILES := $(foreach jar,$(DEXPREOPT_BOOTCLASSPATH_DEX_LOCATIONS),$(PRODUCT_OUT)$(jar)) | ||
18 | |||
16 | DEFAULT_DEX_PREOPT_BUILT_IMAGE_LOCATION := $(DEXPREOPT_BOOT_JAR_DIR_FULL_PATH)/boot.art | 19 | DEFAULT_DEX_PREOPT_BUILT_IMAGE_LOCATION := $(DEXPREOPT_BOOT_JAR_DIR_FULL_PATH)/boot.art |
17 | DEFAULT_DEX_PREOPT_BUILT_IMAGE_FILENAME := $(DEXPREOPT_BOOT_JAR_DIR_FULL_PATH)/$(DEX2OAT_TARGET_ARCH)/boot.art | 20 | DEFAULT_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)) |