diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/Android.run-test.mk | 9 | ||||
| -rwxr-xr-x | test/etc/run-test-jar | 5 |
2 files changed, 7 insertions, 7 deletions
diff --git a/test/Android.run-test.mk b/test/Android.run-test.mk index 5d07601005..e3157ef39f 100644 --- a/test/Android.run-test.mk +++ b/test/Android.run-test.mk @@ -47,12 +47,8 @@ ART_TEST_TARGET_RUN_TEST_DEPENDENCIES += libnativebridgetest-target # Also need libopenjdkjvmti. ART_TEST_TARGET_RUN_TEST_DEPENDENCIES += libopenjdkjvmti-target libopenjdkjvmtid-target -ART_TEST_TARGET_RUN_TEST_DEPENDENCIES += $(TARGET_OUT_JAVA_LIBRARIES)/core-libart-testdex.jar -ART_TEST_TARGET_RUN_TEST_DEPENDENCIES += $(TARGET_OUT_JAVA_LIBRARIES)/core-oj-testdex.jar -ART_TEST_TARGET_RUN_TEST_DEPENDENCIES += $(TARGET_OUT_JAVA_LIBRARIES)/core-simple-testdex.jar -ART_TEST_TARGET_RUN_TEST_DEPENDENCIES += $(TARGET_OUT_JAVA_LIBRARIES)/conscrypt-testdex.jar -ART_TEST_TARGET_RUN_TEST_DEPENDENCIES += $(TARGET_OUT_JAVA_LIBRARIES)/okhttp-testdex.jar -ART_TEST_TARGET_RUN_TEST_DEPENDENCIES += $(TARGET_OUT_JAVA_LIBRARIES)/bouncycastle-testdex.jar +ART_TEST_TARGET_RUN_TEST_DEPENDENCIES += \ + $(foreach jar,$(TARGET_TEST_CORE_JARS),$(TARGET_OUT_JAVA_LIBRARIES)/$(jar).jar) # All tests require the host executables. The tests also depend on the core images, but on # specific version depending on the compiler. @@ -74,6 +70,7 @@ ART_TEST_HOST_RUN_TEST_DEPENDENCIES := \ $(ART_HOST_OUT_SHARED_LIBRARIES)/libopenjdkd$(ART_HOST_SHLIB_EXTENSION) \ $(ART_HOST_OUT_SHARED_LIBRARIES)/libopenjdkjvmti$(ART_HOST_SHLIB_EXTENSION) \ $(ART_HOST_OUT_SHARED_LIBRARIES)/libopenjdkjvmtid$(ART_HOST_SHLIB_EXTENSION) \ + $(HOST_CORE_DEX_LOCATIONS) \ ifneq ($(HOST_PREFER_32_BIT),true) ART_TEST_HOST_RUN_TEST_DEPENDENCIES += \ diff --git a/test/etc/run-test-jar b/test/etc/run-test-jar index 16106ab1c5..4c31ee5160 100755 --- a/test/etc/run-test-jar +++ b/test/etc/run-test-jar @@ -548,7 +548,10 @@ if [ "$USE_JVM" = "y" ]; then exit fi -bpath_modules="core-oj core-libart core-simple conscrypt okhttp bouncycastle" +# Note: This must start with the CORE_IMG_JARS in Android.common_path.mk +# because that's what we use for compiling the core.art image. +# It may contain additional modules from TEST_CORE_JARS. +bpath_modules="core-oj core-libart core-simple okhttp bouncycastle conscrypt" if [ "${HOST}" = "y" ]; then framework="${ANDROID_HOST_OUT}/framework" if [ "${ANDROID_HOST_OUT:0:${#ANDROID_BUILD_TOP}+1}" = "${ANDROID_BUILD_TOP}/" ]; then |