diff options
| author | 2018-08-28 17:36:54 +0000 | |
|---|---|---|
| committer | 2018-08-28 17:36:54 +0000 | |
| commit | 31151ca63cb4bedec4be8e4867bc9dd34c44c3b7 (patch) | |
| tree | d52b4c5de6dc5081512660a7d3d59feaa690ff73 | |
| parent | faf64c9e19eea433e3f9391155717b8d8913a500 (diff) | |
| parent | 1391390a775ca54fa1dd22ceccf211eae84073ea (diff) | |
Merge "Add core-simple to the standard boot classpath"
| -rw-r--r-- | build/Android.gtest.mk | 3 | ||||
| -rw-r--r-- | libartbase/base/common_art_test.cc | 3 | ||||
| -rw-r--r-- | test/Android.run-test.mk | 1 | ||||
| -rwxr-xr-x | test/etc/run-test-jar | 1 |
4 files changed, 6 insertions, 2 deletions
diff --git a/build/Android.gtest.mk b/build/Android.gtest.mk index 81c82b7460..2c073fec13 100644 --- a/build/Android.gtest.mk +++ b/build/Android.gtest.mk @@ -447,7 +447,8 @@ define define-art-gtest-rule-target $$($(3)TARGET_OUT_SHARED_LIBRARIES)/libjavacore.so \ $$($(3)TARGET_OUT_SHARED_LIBRARIES)/libopenjdkd.so \ $$(TARGET_OUT_JAVA_LIBRARIES)/core-libart-testdex.jar \ - $$(TARGET_OUT_JAVA_LIBRARIES)/core-oj-testdex.jar + $$(TARGET_OUT_JAVA_LIBRARIES)/core-oj-testdex.jar \ + $$(TARGET_OUT_JAVA_LIBRARIES)/core-simple-testdex.jar $$(gtest_rule): PRIVATE_TARGET_EXE := $$(gtest_target_exe) $$(gtest_rule): PRIVATE_MAYBE_CHROOT_COMMAND := $$(maybe_chroot_command) diff --git a/libartbase/base/common_art_test.cc b/libartbase/base/common_art_test.cc index e24b073142..6dd2381c7e 100644 --- a/libartbase/base/common_art_test.cc +++ b/libartbase/base/common_art_test.cc @@ -318,7 +318,8 @@ static std::string GetDexFileName(const std::string& jar_prefix, bool host) { std::vector<std::string> CommonArtTestImpl::GetLibCoreDexFileNames() { return std::vector<std::string>({GetDexFileName("core-oj", IsHost()), - GetDexFileName("core-libart", IsHost())}); + GetDexFileName("core-libart", IsHost()), + GetDexFileName("core-simple", IsHost())}); } std::string CommonArtTestImpl::GetTestAndroidRoot() { diff --git a/test/Android.run-test.mk b/test/Android.run-test.mk index 53d4c372c4..ffaa2cd3c7 100644 --- a/test/Android.run-test.mk +++ b/test/Android.run-test.mk @@ -49,6 +49,7 @@ TEST_ART_TARGET_SYNC_DEPS += libopenjdkjvmti-target libopenjdkjvmtid-target TEST_ART_TARGET_SYNC_DEPS += $(TARGET_OUT_JAVA_LIBRARIES)/core-libart-testdex.jar TEST_ART_TARGET_SYNC_DEPS += $(TARGET_OUT_JAVA_LIBRARIES)/core-oj-testdex.jar +TEST_ART_TARGET_SYNC_DEPS += $(TARGET_OUT_JAVA_LIBRARIES)/core-simple-testdex.jar TEST_ART_TARGET_SYNC_DEPS += $(TARGET_OUT_JAVA_LIBRARIES)/okhttp-testdex.jar TEST_ART_TARGET_SYNC_DEPS += $(TARGET_OUT_JAVA_LIBRARIES)/bouncycastle-testdex.jar TEST_ART_TARGET_SYNC_DEPS += $(TARGET_OUT_JAVA_LIBRARIES)/conscrypt-testdex.jar diff --git a/test/etc/run-test-jar b/test/etc/run-test-jar index 5c4ad21bd6..6555b46c0d 100755 --- a/test/etc/run-test-jar +++ b/test/etc/run-test-jar @@ -549,6 +549,7 @@ if [ "$HAVE_IMAGE" = "n" ]; then fi bpath="${framework}/core-libart${bpath_suffix}.jar" bpath="${bpath}:${framework}/core-oj${bpath_suffix}.jar" + bpath="${bpath}:${framework}/core-simple${bpath_suffix}.jar" bpath="${bpath}:${framework}/conscrypt${bpath_suffix}.jar" bpath="${bpath}:${framework}/okhttp${bpath_suffix}.jar" bpath="${bpath}:${framework}/bouncycastle${bpath_suffix}.jar" |