Reduce core image to core-{oj,libart,simple}.
And pass the -Xbootclasspath: and -Xbootclasspath-locations:
options to tests. This eliminates a discrepancy between the
image and boot class path (BCP). Next CL shall check the
BCP stored in the primary boot image oat file against the
BCP from the runtime.
Use actual *-hostdex.jar/*-testdex.jar files for compiling
the core.art. Since conscrypt, okhttp and bouncycastle have
the dex files actually stripped from their *-testdex.jar,
they are unsuitable for compilation, adding another reason
to not include them in the core image. For consistency, use
the same jars for core image on host.
Test: m test-art-host-gtest
Test: testrunner.py --host --optimizing
Test: Pixel 3 XL boots.
Test: m test-art-target-gtest
Test: testrunner.py --target --optimizing
Bug: 119868597
Change-Id: Iccc152ea0d5b3bd9878aa214cc649762f8f4ea9c
16 files changed