Add core-oj to the list of boot libraries.
With some of java classes packed in core-oj instead of core-libart
we need to use core-oj in runtime.
Change-Id: Ic6d5e48517b284fc626c157234b2d50b49a07196
diff --git a/Android.mk b/Android.mk
index 15e8308..eb29abb 100644
--- a/Android.mk
+++ b/Android.mk
@@ -115,10 +115,12 @@
ART_HOST_DEPENDENCIES := \
$(ART_HOST_EXECUTABLES) \
$(HOST_OUT_JAVA_LIBRARIES)/core-libart-hostdex.jar \
+ $(HOST_OUT_JAVA_LIBRARIES)/core-oj-hostdex.jar \
$(ART_HOST_OUT_SHARED_LIBRARIES)/libjavacore$(ART_HOST_SHLIB_EXTENSION)
ART_TARGET_DEPENDENCIES := \
$(ART_TARGET_EXECUTABLES) \
$(TARGET_OUT_JAVA_LIBRARIES)/core-libart.jar \
+ $(TARGET_OUT_JAVA_LIBRARIES)/core-oj.jar \
$(TARGET_OUT_SHARED_LIBRARIES)/libjavacore.so
ifdef TARGET_2ND_ARCH
ART_TARGET_DEPENDENCIES += $(2ND_TARGET_OUT_SHARED_LIBRARIES)/libjavacore.so
diff --git a/build/Android.common_path.mk b/build/Android.common_path.mk
index 10695b6..db4b786 100644
--- a/build/Android.common_path.mk
+++ b/build/Android.common_path.mk
@@ -72,7 +72,7 @@
TARGET_CORE_IMG_LOCATION := $(ART_TARGET_TEST_OUT)/core.art
# Jar files for core.art.
-TARGET_CORE_JARS := core-libart conscrypt okhttp core-junit bouncycastle
+TARGET_CORE_JARS := core-oj 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)
diff --git a/runtime/dex_method_iterator_test.cc b/runtime/dex_method_iterator_test.cc
index b8f180b..2bed345 100644
--- a/runtime/dex_method_iterator_test.cc
+++ b/runtime/dex_method_iterator_test.cc
@@ -29,7 +29,7 @@
TEST_F(DexMethodIteratorTest, Basic) {
ScopedObjectAccess soa(Thread::Current());
std::vector<const DexFile*> dex_files;
- const char* jars[] = { "core-libart", "conscrypt", "okhttp", "core-junit", "bouncycastle" };
+ const char* jars[] = { "core-oj", "core-libart", "conscrypt", "okhttp", "core-junit", "bouncycastle" };
for (size_t i = 0; i < 5; ++i) {
dex_files.push_back(LoadExpectSingleDexFile(GetDexFileName(jars[i]).c_str()));
}