commit 50912342f10e769f17b9ea0e2174633af6f95cd3
author Ian Rogers <irogers@google.com> Mon May 12 23:00:45 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon May 12 23:00:45 2014 +0000
tree 9e57321aa9d8b1306746e9ae8017431d8ff825a2
parent 6c432940599d5f5d3d11a26f12342845433f0a98
parent f544a5f4d57750b569333a59d57f568121f6f4a3

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

* commit 'f544a5f4d57750b569333a59d57f568121f6f4a3':
  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)