commit f3b3bf13247364eb111cd20493a236e8f3ce2164
author Brian Carlstrom <bdc@google.com> Tue Jun 25 23:28:49 2013 -0700
committer Brian Carlstrom <bdc@google.com> Wed Jun 26 06:31:05 2013 +0000
tree 28a51531ad24a9ba4760e7576ae2c63881261a10
parent 3b010aa88cec548a9a4213c7cbdc416f73ea5c3c

Make art use core-libart explicitly (part 2)

Change-Id: Id08306ae147c745a407635d6ce93019f14145181
(cherry picked from commit eae05507f22a9f58d2058514496afd0f9b3e94b6)

build/Android.oat.mk

diff --git a/build/Android.oat.mk b/build/Android.oat.mk
index 05f15e7..0e91b43 100644
--- a/build/Android.oat.mk
+++ b/build/Android.oat.mk
@@ -82,6 +82,7 @@
 ########################################################################
 # The full system boot classpath
 TARGET_BOOT_JARS := $(subst :, ,$(DEXPREOPT_BOOT_JARS))
+TARGET_BOOT_JARS := $(foreach jar,$(TARGET_BOOT_JARS),$(patsubst core, core-libart,$(jar)))
 TARGET_BOOT_DEX_LOCATIONS := $(foreach jar,$(TARGET_BOOT_JARS),/$(DEXPREOPT_BOOT_JAR_DIR)/$(jar).jar)
 TARGET_BOOT_DEX_FILES := $(foreach jar,$(TARGET_BOOT_JARS),$(call intermediates-dir-for,JAVA_LIBRARIES,$(jar),,COMMON)/javalib.jar)