commit 3b010aa88cec548a9a4213c7cbdc416f73ea5c3c
author Brian Carlstrom <bdc@google.com> Tue Jun 25 23:06:36 2013 -0700
committer Brian Carlstrom <bdc@google.com> Tue Jun 25 23:06:36 2013 -0700
tree 155c461f956cc45f1c6152f3da6ef095c01bb4fd
parent fb67b724df2e3288c8573e8d72b6b6d06aff26ca

Make art use core-libart explicitly

Change-Id: Ibc75910df56428dd8d5d2a4bab41dc3d2a3c61d7

build/Android.oat.mk

diff --git a/build/Android.oat.mk b/build/Android.oat.mk
index 2daf5d0..05f15e7 100644
--- a/build/Android.oat.mk
+++ b/build/Android.oat.mk
@@ -39,7 +39,7 @@
 
 ########################################################################
 # A smaller libcore only oat file
-TARGET_CORE_JARS := core conscrypt okhttp core-junit bouncycastle
+TARGET_CORE_JARS := core-libart conscrypt okhttp core-junit bouncycastle
 HOST_CORE_JARS := $(addsuffix -hostdex,$(TARGET_CORE_JARS))
 
 HOST_CORE_DEX_LOCATIONS   := $(foreach jar,$(HOST_CORE_JARS),  $(HOST_OUT_JAVA_LIBRARIES)/$(jar).jar)

src/common_test.h

diff --git a/src/common_test.h b/src/common_test.h
index 3baa77c..8d8ad5e 100644
--- a/src/common_test.h
+++ b/src/common_test.h
@@ -396,7 +396,7 @@
   }
 
   std::string GetLibCoreDexFileName() {
-    return GetDexFileName("core");
+    return GetDexFileName("core-libart");
   }
 
   std::string GetConscryptFileName() {