commit d41f64c4fe7919d24af5bc29ee92dc7ab193181a
author Nicolas Geoffray <ngeoffray@google.com> Fri Jan 11 15:46:41 2019 +0000
committer Nicolas Geoffray <ngeoffray@google.com> Fri Jan 11 15:46:41 2019 +0000
tree 438bdb72fad123992c1c2d7f4109d2bf0d1aea1c
parent 4a60ab2c6caac1c1d52a0a9189d4f6f36cd78a00

Fix braino in ART script.

We need to pass the boot classpath for any core* image.

Test: golem benchmarks
Change-Id: I30665ff5138211908297ec3acca2451a5308a12a

tools/art

diff --git a/tools/art b/tools/art
index 6e43863..0a547c6 100644
--- a/tools/art
+++ b/tools/art
@@ -456,7 +456,7 @@
   exit 1
 fi
 
-if [[ "$DEX2OAT_BOOT_IMAGE" = *core.art && "$DEX2OAT_BCP" = "" ]]; then
+if [[ "$DEX2OAT_BOOT_IMAGE" = *core*.art && "$DEX2OAT_BCP" = "" ]]; 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.