diff options
| -rwxr-xr-x | tools/buildbot-build.sh | 2 | ||||
| -rwxr-xr-x | tools/run-libcore-tests.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tools/buildbot-build.sh b/tools/buildbot-build.sh index 8a1c10b3ea..4af36c5b68 100755 --- a/tools/buildbot-build.sh +++ b/tools/buildbot-build.sh @@ -39,7 +39,7 @@ else fi java_libraries_dir=${out_dir}/target/common/obj/JAVA_LIBRARIES -common_targets="vogar core-tests apache-harmony-jdwp-tests-hostdex jsr166-tests libartpalette-system mockito-target" +common_targets="vogar core-tests core-ojtests apache-harmony-jdwp-tests-hostdex jsr166-tests libartpalette-system mockito-target" # These build targets have different names on device and host. specific_targets="libjavacoretests libwrapagentproperties libwrapagentpropertiesd" build_host="no" diff --git a/tools/run-libcore-tests.py b/tools/run-libcore-tests.py index 99a6a74588..b485c736fc 100755 --- a/tools/run-libcore-tests.py +++ b/tools/run-libcore-tests.py @@ -114,7 +114,7 @@ BOOT_CLASSPATH = [ "/apex/com.android.conscrypt/javalib/conscrypt.jar", ] -CLASSPATH = ["core-tests", "jsr166-tests", "mockito-target"] +CLASSPATH = ["core-tests", "core-ojtests", "jsr166-tests", "mockito-target"] def get_jar_filename(classpath): base_path = (ANDROID_PRODUCT_OUT + "/../..") if ANDROID_PRODUCT_OUT else "out/target" |