Fix regression in vm tests 021 and 082
dex2oat defaults to build.art for the image which includes the junit
classes used by these tests. At runtime these tests are run with
core.art and so the code is missing. Change dex2oat to specify the boot
image is core.art.
Change-Id: Icd80560ac06798634f47922cc9fb592966f2b511
diff --git a/test/056-const-string-jumbo/build b/test/056-const-string-jumbo/build
index 5f23407..325c02a 100644
--- a/test/056-const-string-jumbo/build
+++ b/test/056-const-string-jumbo/build
@@ -44,4 +44,4 @@
dx -JXmx500m --debug --dex --no-optimize --positions=none --no-locals --dump-to=classes.lst --output=classes.dex classes
zip ${ANDROID_PRODUCT_OUT}/data/art-test/$TEST_NAME.jar classes.dex
-dex2oat --dex-file=${ANDROID_PRODUCT_OUT}/data/art-test/$TEST_NAME.jar --oat=${ANDROID_PRODUCT_OUT}/data/art-test/$TEST_NAME.oat
+dex2oat --boot-image=${ANDROID_PRODUCT_OUT}/data/art-test/core.art --dex-file=${ANDROID_PRODUCT_OUT}/data/art-test/$TEST_NAME.jar --oat=${ANDROID_PRODUCT_OUT}/data/art-test/$TEST_NAME.oat