diff options
| author | Brian Carlstrom <bdc@google.com> | 2014-01-28 20:54:10 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-01-28 20:54:10 +0000 |
| commit | 1737b1ab5fe4e084507631a5308d826d3643f7c2 (patch) | |
| tree | 68943f764a1d601aec96a68d3dd4a0032a8e3ed6 /core | |
| parent | 23710e27bc23bb32dc99f35ec0c31e4185586ec0 (diff) | |
| parent | dc5dd9b47fe2a24410b3e70d320655f1b5455966 (diff) | |
| download | build-1737b1ab5fe4e084507631a5308d826d3643f7c2.zip build-1737b1ab5fe4e084507631a5308d826d3643f7c2.tar.gz build-1737b1ab5fe4e084507631a5308d826d3643f7c2.tar.bz2 | |
am dc5dd9b4: am d3737d07: am 49eb4409: Merge "build: PRODUCT_DEX_PREOPT_IMAGE_IN_DATA"
* commit 'dc5dd9b47fe2a24410b3e70d320655f1b5455966':
build: PRODUCT_DEX_PREOPT_IMAGE_IN_DATA
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)) |