diff options
| -rw-r--r-- | build/Android.gtest.mk | 3 | ||||
| -rwxr-xr-x | test/run-test | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/build/Android.gtest.mk b/build/Android.gtest.mk index 170a6fc39a..69f7e3439f 100644 --- a/build/Android.gtest.mk +++ b/build/Android.gtest.mk @@ -334,7 +334,8 @@ define define-art-gtest-rule-target $$(ART_TARGET_NATIVETEST_OUT)/$$(TARGET_$(2)ARCH)/$(1) \ $$($(2)TARGET_OUT_SHARED_LIBRARIES)/libjavacore.so \ $$($(2)TARGET_OUT_SHARED_LIBRARIES)/libxxavacore.so \ - $$(TARGET_OUT_JAVA_LIBRARIES)/core-libart.jar + $$(TARGET_OUT_JAVA_LIBRARIES)/core-libart.jar \ + $$(TARGET_OUT_JAVA_LIBRARIES)/core-oj.jar .PHONY: $$(gtest_rule) $$(gtest_rule): test-art-target-sync diff --git a/test/run-test b/test/run-test index 8410387f13..b9df1f51ed 100755 --- a/test/run-test +++ b/test/run-test @@ -93,7 +93,7 @@ fi # If JACK_CLASSPATH is not set, assume it only contains core-libart. if [ -z "$JACK_CLASSPATH" ]; then - export JACK_CLASSPATH="$ANDROID_BUILD_TOP/out/host/common/obj/JAVA_LIBRARIES/core-libart-hostdex_intermediates/classes.jack" + export JACK_CLASSPATH="$ANDROID_BUILD_TOP/out/host/common/obj/JAVA_LIBRARIES/core-libart-hostdex_intermediates/classes.jack:$ANDROID_BUILD_TOP/out/host/common/obj/JAVA_LIBRARIES/core-oj-hostdex_intermediates/classes.jack:" fi # If JACK_JAR is not set, assume it is located in the prebuilts directory. @@ -406,7 +406,7 @@ fi if [ "$runtime" = "dalvik" ]; then if [ "$target_mode" = "no" ]; then framework="${ANDROID_PRODUCT_OUT}/system/framework" - bpath="${framework}/core.jar:${framework}/conscrypt.jar:${framework}/okhttp.jar:${framework}/core-junit.jar:${framework}/bouncycastle.jar:${framework}/ext.jar" + bpath="${framework}/core-libart.jar:${framework}/core-oj.jar:${framework}/conscrypt.jar:${framework}/okhttp.jar:${framework}/core-junit.jar:${framework}/bouncycastle.jar:${framework}/ext.jar:" run_args="${run_args} --boot -Xbootclasspath:${bpath}" else true # defaults to using target BOOTCLASSPATH @@ -449,6 +449,7 @@ if [ "$have_image" = "no" ]; then # TODO If the target was compiled WITH_DEXPREOPT=true then these tests will # fail since these jar files will be stripped. bpath="${framework}/core-libart${bpath_suffix}.jar" + bpath="${bpath}:${framework}/core-oj${bpath_suffix}.jar" bpath="${bpath}:${framework}/conscrypt${bpath_suffix}.jar" bpath="${bpath}:${framework}/okhttp${bpath_suffix}.jar" bpath="${bpath}:${framework}/core-junit${bpath_suffix}.jar" |