diff options
| -rw-r--r-- | Android.mk | 4 | ||||
| -rw-r--r-- | runtime/dex_method_iterator_test.cc | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Android.mk b/Android.mk index 76fb411ac6..0492d3cc5d 100644 --- a/Android.mk +++ b/Android.mk @@ -93,9 +93,9 @@ include $(art_path)/jdwpspy/Android.mk 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 diff --git a/runtime/dex_method_iterator_test.cc b/runtime/dex_method_iterator_test.cc index 9961df9a55..2941db6945 100644 --- a/runtime/dex_method_iterator_test.cc +++ b/runtime/dex_method_iterator_test.cc @@ -36,7 +36,7 @@ class DexMethodIteratorTest : public CommonTest { 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")); |