commit 8c6360e62cf7cd2e64098373f13094d4bfb33cd5
author Ian Rogers <irogers@google.com> Mon May 12 23:04:31 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon May 12 23:04:31 2014 +0000
tree 3ebfac49339f121189c0616f5419f3c4a26d0ffa
parent 66f2af4e555a3627285fb969ec0a8dc28d326830
parent 50912342f10e769f17b9ea0e2174633af6f95cd3

am 50912342: am f544a5f4: Merge "Place ISA in ART boot image name."

* commit '50912342f10e769f17b9ea0e2174633af6f95cd3':
  Place ISA in ART boot image name.

core/dex_preopt_libart.mk

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