diff options
| author | Vladimir Marko <vmarko@google.com> | 2018-12-14 11:11:47 +0000 |
|---|---|---|
| committer | Vladimir Marko <vmarko@google.com> | 2018-12-14 13:12:15 +0000 |
| commit | 0ace5633680af8864b76b4f45d63b3407e4dcdf5 (patch) | |
| tree | 526435a2877d3d04eaa471238b4efd37a347d05d /tools | |
| parent | d97e00c4f6e8735a854f4443b8bd08fc5a251ce5 (diff) | |
| download | art-0ace5633680af8864b76b4f45d63b3407e4dcdf5.tar.gz art-0ace5633680af8864b76b4f45d63b3407e4dcdf5.tar.bz2 art-0ace5633680af8864b76b4f45d63b3407e4dcdf5.zip | |
Revert^2 "Allow boot image for a part of the boot classpath."
This reverts commit fb83d76a8b186df05f874216b535f5ad57e7bd02.
Fixed host run-test dependencies, cleaned up target run-test
and gtest dependencies.
Test: rm -f out/host/linux-x86/framework/conscrypt-hostdex.jar
testrunner.py -b --host --optimizing -t 660-clinit
Bug: 119868597
Change-Id: Ia0a5aba0223ae6616bf3e109daf0af7b8355d048
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/bootjars.sh | 6 | ||||
| -rwxr-xr-x | tools/run-jdwp-tests.sh | 5 | ||||
| -rwxr-xr-x | tools/run-libcore-tests.sh | 5 |
3 files changed, 10 insertions, 6 deletions
diff --git a/tools/bootjars.sh b/tools/bootjars.sh index ad6ee6b058..9f2282764e 100755 --- a/tools/bootjars.sh +++ b/tools/bootjars.sh @@ -72,8 +72,10 @@ if [[ $core_jars_only == y ]]; then # FIXME: The soong invocation we're using for getting the variables does not give us anything # defined in Android.common_path.mk, otherwise we would just use HOST-/TARGET_TEST_CORE_JARS. - # The core_jars_list must match the TEST_CORE_JARS variable in the Android.common_path.mk . - core_jars_list="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. + core_jars_list="core-oj core-libart core-simple" core_jars_suffix= if [[ $mode == target ]]; then core_jars_suffix=-testdex diff --git a/tools/run-jdwp-tests.sh b/tools/run-jdwp-tests.sh index f4a2dc1a6a..c85a5ed643 100755 --- a/tools/run-jdwp-tests.sh +++ b/tools/run-jdwp-tests.sh @@ -55,9 +55,10 @@ function boot_classpath_arg { done } -# Note: This must match the TEST_CORE_JARS in Android.common_path.mk +# 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. -BOOT_CLASSPATH_JARS="core-oj core-libart core-simple conscrypt okhttp bouncycastle" +# It may contain additional modules from TEST_CORE_JARS. +BOOT_CLASSPATH_JARS="core-oj core-libart core-simple okhttp bouncycastle conscrypt" vm_args="" art="$android_root/bin/art" diff --git a/tools/run-libcore-tests.sh b/tools/run-libcore-tests.sh index 63f1fce13f..63fe81be6f 100755 --- a/tools/run-libcore-tests.sh +++ b/tools/run-libcore-tests.sh @@ -57,9 +57,10 @@ function boot_classpath_arg { done } -# Note: This must match the TEST_CORE_JARS in Android.common_path.mk +# 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. -BOOT_CLASSPATH_JARS="core-oj core-libart core-simple conscrypt okhttp bouncycastle" +# It may contain additional modules from TEST_CORE_JARS. +BOOT_CLASSPATH_JARS="core-oj core-libart core-simple okhttp bouncycastle conscrypt" DEPS="core-tests jsr166-tests mockito-target" |