diff options
| -rw-r--r-- | build/Android.oat.mk | 2 | ||||
| -rw-r--r-- | src/common_test.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/build/Android.oat.mk b/build/Android.oat.mk index 2daf5d0cec..05f15e7b6d 100644 --- a/build/Android.oat.mk +++ b/build/Android.oat.mk @@ -39,7 +39,7 @@ PRELOADED_CLASSES := frameworks/base/preloaded-classes ######################################################################## # 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) diff --git a/src/common_test.h b/src/common_test.h index 88da8a2023..11bd4f0957 100644 --- a/src/common_test.h +++ b/src/common_test.h @@ -398,7 +398,7 @@ class CommonTest : public testing::Test { } std::string GetLibCoreDexFileName() { - return GetDexFileName("core"); + return GetDexFileName("core-libart"); } std::string GetConscryptFileName() { |