diff options
| author | Brian Carlstrom <bdc@google.com> | 2014-01-16 23:25:27 -0800 |
|---|---|---|
| committer | Brian Carlstrom <bdc@google.com> | 2014-01-28 11:29:58 -0800 |
| commit | 8fb5dfc5c716f823b48617fa35a486b2bc696731 (patch) | |
| tree | 48a15a053703408a19018410d66f0ebdbcf39bc4 /core | |
| parent | cdd1475834156b2e45b73ae86a949efa6c1215eb (diff) | |
| download | build-8fb5dfc5c716f823b48617fa35a486b2bc696731.zip build-8fb5dfc5c716f823b48617fa35a486b2bc696731.tar.gz build-8fb5dfc5c716f823b48617fa35a486b2bc696731.tar.bz2 | |
build: PRODUCT_DEX_PREOPT_IMAGE_IN_DATA
(cherry-picked from commit cd337c71ee65b17529a67af34d4c0b2824a4f175)
Change-Id: I6d8ab3b3cf52f6a6b15f1c8e8d00cdf59042436b
Diffstat (limited to 'core')
| -rw-r--r-- | core/dex_preopt_libart.mk | 4 | ||||
| -rw-r--r-- | core/product.mk | 6 | ||||
| -rw-r--r-- | core/product_config.mk | 4 |
3 files changed, 11 insertions, 3 deletions
diff --git a/core/dex_preopt_libart.mk b/core/dex_preopt_libart.mk index 1e7b193..fa2b7e3 100644 --- a/core/dex_preopt_libart.mk +++ b/core/dex_preopt_libart.mk @@ -26,12 +26,16 @@ PRELOADED_CLASSES := frameworks/base/preloaded-classes LIBART_BOOT_IMAGE := /$(DEXPREOPT_BOOT_JAR_DIR)/boot.art DEFAULT_DEX_PREOPT_BUILT_IMAGE := $(DEXPREOPT_BOOT_JAR_DIR_FULL_PATH)/boot.art + +DEFAULT_DEX_PREOPT_INSTALLED_IMAGE := +ifneq ($(PRODUCT_DEX_PREOPT_IMAGE_IN_DATA),true) DEFAULT_DEX_PREOPT_INSTALLED_IMAGE := $(PRODUCT_OUT)$(LIBART_BOOT_IMAGE) # The rule to install boot.art and boot.oat $(DEFAULT_DEX_PREOPT_INSTALLED_IMAGE) : $(DEFAULT_DEX_PREOPT_BUILT_IMAGE) | $(ACP) $(call copy-file-to-target) $(hide) $(ACP) -fp $(patsubst %.art,%.oat,$<) $(patsubst %.art,%.oat,$@) +endif DEX2OAT_TARGET_INSTRUCTION_SET_FEATURES := default ifeq ($(TARGET_CPU_VARIANT),$(filter $(TARGET_CPU_VARIANT),cortex-a15 krait)) diff --git a/core/product.mk b/core/product.mk index a2f4abc..cf6fb9a 100644 --- a/core/product.mk +++ b/core/product.mk @@ -97,8 +97,8 @@ _product_var_list := \ PRODUCT_FACTORY_RAMDISK_MODULES \ PRODUCT_FACTORY_BUNDLE_MODULES \ PRODUCT_RUNTIMES \ - PRODUCT_BOOT_JARS - + PRODUCT_BOOT_JARS \ + PRODUCT_DEX_PREOPT_IMAGE_IN_DATA \ define dump-product $(info ==== $(1) ====)\ @@ -255,7 +255,7 @@ _product_stash_var_list += \ DEFAULT_SYSTEM_DEV_CERTIFICATE # -# Stash vaues of the variables in _product_stash_var_list. +# Stash values of the variables in _product_stash_var_list. # $(1): Renamed prefix # define stash-product-vars diff --git a/core/product_config.mk b/core/product_config.mk index 0574c66..7a27426 100644 --- a/core/product_config.mk +++ b/core/product_config.mk @@ -402,3 +402,7 @@ PRODUCT_OTA_PUBLIC_KEYS := $(sort \ PRODUCT_EXTRA_RECOVERY_KEYS := $(sort \ $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_EXTRA_RECOVERY_KEYS)) + +# If there is no room in /system for the image, place it in /data +PRODUCT_DEX_PREOPT_IMAGE_IN_DATA := \ + $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_DEX_PREOPT_IMAGE_IN_DATA)) |