summaryrefslogtreecommitdiffstats
path: root/core/dex_preopt_libart.mk
diff options
context:
space:
mode:
authorIan Rogers <irogers@google.com>2014-05-09 17:11:49 -0700
committerIan Rogers <irogers@google.com>2014-05-12 15:17:25 -0700
commit334497b8b683718ba410fdb89b9ff5061d59d2c3 (patch)
tree1ed063a17782bc1913442374aa3c76a4de7214cd /core/dex_preopt_libart.mk
parentdcdc985c47338c29e66a22941904abd4171607c9 (diff)
downloadbuild-334497b8b683718ba410fdb89b9ff5061d59d2c3.zip
build-334497b8b683718ba410fdb89b9ff5061d59d2c3.tar.gz
build-334497b8b683718ba410fdb89b9ff5061d59d2c3.tar.bz2
Place ISA in ART boot image name.
Depends upon: https://android-review.googlesource.com/#/c/94096/2 Change-Id: I79bec60a17ea7cf9214e56f8035d4a1b80b0eeb6
Diffstat (limited to 'core/dex_preopt_libart.mk')
-rw-r--r--core/dex_preopt_libart.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/dex_preopt_libart.mk b/core/dex_preopt_libart.mk
index 73e8494..7f3285c 100644
--- a/core/dex_preopt_libart.mk
+++ b/core/dex_preopt_libart.mk
@@ -23,9 +23,9 @@ DEX2OATD_DEPENDENCY += $(LIBARTD_COMPILER)
PRELOADED_CLASSES := frameworks/base/preloaded-classes
-LIBART_BOOT_IMAGE := /$(DEXPREOPT_BOOT_JAR_DIR)/boot.art
+LIBART_BOOT_IMAGE := /$(DEXPREOPT_BOOT_JAR_DIR)/boot-$(DEX2OAT_TARGET_ARCH).art
-DEFAULT_DEX_PREOPT_BUILT_IMAGE := $(DEXPREOPT_BOOT_JAR_DIR_FULL_PATH)/boot.art
+DEFAULT_DEX_PREOPT_BUILT_IMAGE := $(DEXPREOPT_BOOT_JAR_DIR_FULL_PATH)/boot-$(DEX2OAT_TARGET_ARCH).art
DEFAULT_DEX_PREOPT_INSTALLED_IMAGE :=
ifneq ($(PRODUCT_DEX_PREOPT_IMAGE_IN_DATA),true)