diff options
| author | Vladimir Marko <vmarko@google.com> | 2018-12-13 08:42:54 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-12-13 08:42:54 +0000 |
| commit | cf923f535dd1cf0c03707bbdfca6335d3f88fa92 (patch) | |
| tree | 8d45b1dce534b2b53a1a0b81fd81f3a823da92f3 /tools | |
| parent | 3c9d3033b5920bf09abeac41e72e2f22f20f316a (diff) | |
| parent | 4433c4351aab98005e12a6b53905678758b74665 (diff) | |
| download | art-cf923f535dd1cf0c03707bbdfca6335d3f88fa92.tar.gz art-cf923f535dd1cf0c03707bbdfca6335d3f88fa92.tar.bz2 art-cf923f535dd1cf0c03707bbdfca6335d3f88fa92.zip | |
Merge "Allow boot image for a part of the boot classpath."
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" |