From 334497b8b683718ba410fdb89b9ff5061d59d2c3 Mon Sep 17 00:00:00 2001 From: Ian Rogers Date: Fri, 9 May 2014 17:11:49 -0700 Subject: [PATCH] Place ISA in ART boot image name. Depends upon: https://android-review.googlesource.com/#/c/94096/2 Change-Id: I79bec60a17ea7cf9214e56f8035d4a1b80b0eeb6 --- core/dex_preopt_libart.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/dex_preopt_libart.mk b/core/dex_preopt_libart.mk index 73e8494f9e..7f3285ce16 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)