commit fd7ad0acf1a50e248fff1a9849c8d89e9e200ef6
author Brian Carlstrom <bdc@google.com> Tue Dec 10 18:20:45 2013 -0800
committer Brian Carlstrom <bdc@google.com> Tue Dec 10 23:44:07 2013 -0800
tree 1e272c7d62bad4eecba4f3faa88c9796c926d56a
parent 08cbf66dc4632913f80f8ac18082c39b7d52c7dd

Fix dependencies to be on core-libart, not core

Change-Id: I002f4ab170146d48210655fbed44328a289873f5

Android.mk

diff --git a/Android.mk b/Android.mk
index 76fb411..0492d3c 100644
--- a/Android.mk
+++ b/Android.mk
@@ -93,9 +93,9 @@
 include $(art_build_path)/Android.oat.mk
 
 # ART_HOST_DEPENDENCIES depends on Android.executable.mk above for ART_HOST_EXECUTABLES
-ART_HOST_DEPENDENCIES := $(ART_HOST_EXECUTABLES) $(HOST_OUT_JAVA_LIBRARIES)/core-hostdex.jar
+ART_HOST_DEPENDENCIES := $(ART_HOST_EXECUTABLES) $(HOST_OUT_JAVA_LIBRARIES)/core-libart-hostdex.jar
 ART_HOST_DEPENDENCIES += $(HOST_OUT_SHARED_LIBRARIES)/libjavacore$(ART_HOST_SHLIB_EXTENSION)
-ART_TARGET_DEPENDENCIES := $(ART_TARGET_EXECUTABLES) $(TARGET_OUT_JAVA_LIBRARIES)/core.jar $(TARGET_OUT_SHARED_LIBRARIES)/libjavacore.so
+ART_TARGET_DEPENDENCIES := $(ART_TARGET_EXECUTABLES) $(TARGET_OUT_JAVA_LIBRARIES)/core-libart.jar $(TARGET_OUT_SHARED_LIBRARIES)/libjavacore.so
 
 ########################################################################
 # test targets

runtime/dex_method_iterator_test.cc

diff --git a/runtime/dex_method_iterator_test.cc b/runtime/dex_method_iterator_test.cc
index 9961df9..2941db6 100644
--- a/runtime/dex_method_iterator_test.cc
+++ b/runtime/dex_method_iterator_test.cc
@@ -36,7 +36,7 @@
 TEST_F(DexMethodIteratorTest, Basic) {
   ScopedObjectAccess soa(Thread::Current());
   std::vector<const DexFile*> dex_files;
-  dex_files.push_back(OpenDexFile("core"));
+  dex_files.push_back(OpenDexFile("core-libart"));
   dex_files.push_back(OpenDexFile("conscrypt"));
   dex_files.push_back(OpenDexFile("okhttp"));
   dex_files.push_back(OpenDexFile("core-junit"));