commit 8fb5dfc5c716f823b48617fa35a486b2bc696731
author Brian Carlstrom <bdc@google.com> Thu Jan 16 23:25:27 2014 -0800
committer Brian Carlstrom <bdc@google.com> Tue Jan 28 11:29:58 2014 -0800
tree 48a15a053703408a19018410d66f0ebdbcf39bc4
parent cdd1475834156b2e45b73ae86a949efa6c1215eb

build: PRODUCT_DEX_PREOPT_IMAGE_IN_DATA

(cherry-picked from commit cd337c71ee65b17529a67af34d4c0b2824a4f175)

Change-Id: I6d8ab3b3cf52f6a6b15f1c8e8d00cdf59042436b

core/dex_preopt_libart.mk

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 @@
 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))