From ec91d48cade73c54f7a03c5d53d863bc2490976e Mon Sep 17 00:00:00 2001 From: Vladimir Marko Date: Thu, 29 Nov 2018 12:17:11 +0000 Subject: 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 --- runtime/common_runtime_test.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'runtime/common_runtime_test.h') diff --git a/runtime/common_runtime_test.h b/runtime/common_runtime_test.h index c48ab3629c..f5b9058893 100644 --- a/runtime/common_runtime_test.h +++ b/runtime/common_runtime_test.h @@ -97,6 +97,9 @@ class CommonRuntimeTestImpl : public CommonArtTestImpl { return true; } + static bool StartDex2OatCommandLine(/*out*/std::vector* argv, + /*out*/std::string* error_msg); + protected: // Allow subclases such as CommonCompilerTest to add extra options. virtual void SetUpRuntimeOptions(RuntimeOptions* options ATTRIBUTE_UNUSED) {} -- cgit v1.2.3-59-g8ed1b