diff options
| author | Vladimir Marko <vmarko@google.com> | 2018-12-03 18:47:23 +0000 |
|---|---|---|
| committer | Vladimir Marko <vmarko@google.com> | 2018-12-04 17:17:19 +0000 |
| commit | 7a85e70b2bf646d1d7a226fbb4e7fafb66871dd5 (patch) | |
| tree | 790ee4c1cee812535c856a08355c50c2032c5cd4 /oatdump | |
| parent | 6a98f89c4ad645b04d6c80d3d7e260c59bf6f193 (diff) | |
| download | art-7a85e70b2bf646d1d7a226fbb4e7fafb66871dd5.tar.gz art-7a85e70b2bf646d1d7a226fbb4e7fafb66871dd5.tar.bz2 art-7a85e70b2bf646d1d7a226fbb4e7fafb66871dd5.zip | |
Reduce core image to 6 modules.
This was
Revert^2 "Reduce core image to core-{oj,libart,simple}."
but we're now keeping three additional modules, namely
conscrypt, okhttp and bouncycastle. And we fix the boot
class path used by vogar with the companion change
https://android-review.googlesource.com/840810 .
This reverts commit 00fe35e4021e9a8679eca3ffaede48fd89b56258.
Change-Id: I6137edd91c03c17be50de200267eb9adc971e8fb
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
Test: art/tools/run-libcore-tests.sh --mode=device --variant=X64
Bug: 119868597
Diffstat (limited to 'oatdump')
| -rw-r--r-- | oatdump/oatdump_test.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/oatdump/oatdump_test.h b/oatdump/oatdump_test.h index 4ee510130b..728939f93c 100644 --- a/oatdump/oatdump_test.h +++ b/oatdump/oatdump_test.h @@ -122,6 +122,10 @@ class OatDumpTest : public CommonRuntimeTest { "-Xmx512m", "--runtime-arg", "-Xnorelocate", + "--runtime-arg", + GetClassPathOption("-Xbootclasspath:", GetLibCoreDexFileNames()), + "--runtime-arg", + GetClassPathOption("-Xbootclasspath-locations:", GetLibCoreDexLocations()), "--boot-image=" + GetCoreArtLocation(), "--instruction-set=" + std::string(GetInstructionSetString(kRuntimeISA)), "--dex-file=" + GetTestDexFileName(GetAppBaseName().c_str()), @@ -181,6 +185,11 @@ class OatDumpTest : public CommonRuntimeTest { expected_prefixes.push_back("IMAGE BEGIN:"); expected_prefixes.push_back("kDexCaches:"); } else if (mode == kModeOatWithBootImage) { + exec_argv.push_back("--runtime-arg"); + exec_argv.push_back(GetClassPathOption("-Xbootclasspath:", GetLibCoreDexFileNames())); + exec_argv.push_back("--runtime-arg"); + exec_argv.push_back( + GetClassPathOption("-Xbootclasspath-locations:", GetLibCoreDexLocations())); exec_argv.push_back("--boot-image=" + GetCoreArtLocation()); exec_argv.push_back("--instruction-set=" + std::string( GetInstructionSetString(kRuntimeISA))); |