summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Vladimir Marko <vmarko@google.com> 2018-12-20 17:25:41 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2018-12-20 17:25:41 +0000
commitd88f3eba1a2c879b362ffdcb3ce0acfff4570db4 (patch)
treee39f932684c0dc0151996d7604c4c339db222c73
parent710a3a7553998f98a5de12e46e223833b7360be2 (diff)
parenta5d931f2724b29e99ea5e25464e37679952c6389 (diff)
Merge "Fix core jars list in bootjars.sh ."
-rwxr-xr-xtools/bootjars.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/bootjars.sh b/tools/bootjars.sh
index 9f2282764e..320d4b5f4a 100755
--- a/tools/bootjars.sh
+++ b/tools/bootjars.sh
@@ -75,7 +75,7 @@ if [[ $core_jars_only == y ]]; then
# 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_list="core-oj core-libart core-simple okhttp bouncycastle apache-xml conscrypt"
core_jars_suffix=
if [[ $mode == target ]]; then
core_jars_suffix=-testdex