diff options
| author | Vladimir Marko <vmarko@google.com> | 2018-12-07 18:04:10 +0000 |
|---|---|---|
| committer | Vladimir Marko <vmarko@google.com> | 2018-12-07 18:13:55 +0000 |
| commit | 91f1032505cfaec3aef51fc0a3085b213813f0ed (patch) | |
| tree | 6469e772d9fb562d26dc1d22dd0b71844bbb743f /oatdump | |
| parent | 573b3877fac3c5a4a9703301502694fe7219b21c (diff) | |
| download | art-91f1032505cfaec3aef51fc0a3085b213813f0ed.tar.gz art-91f1032505cfaec3aef51fc0a3085b213813f0ed.tar.bz2 art-91f1032505cfaec3aef51fc0a3085b213813f0ed.zip | |
Revert^2 "Pass boot class path to ImageSpace::LoadBootImage."
This reverts commit db4b1deebf425be5f1d0f597d1ef540f19908324.
Fixed JDWP tests, see "Test:" stanzas below.
Change-Id: I6fb56ac990b78164cbd3f93c9f6df66e0dd9a813
Test: m test-art-host-gtest
Test: testrunner.py --host --optimizing
Test: Pixel 2 XL boots.
Test: m test-art-target-gtest
Test: testrunner.py --target --optimizing
Test: run-libcore-tests.sh --mode=device --variant=X64
Test: run-jdwp-tests.sh --mode=host --variant=X64
Test: run-jdwp-tests.sh --mode=device --variant=X64
Bug: 119868597
Diffstat (limited to 'oatdump')
| -rw-r--r-- | oatdump/oatdump_test.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/oatdump/oatdump_test.h b/oatdump/oatdump_test.h index 728939f93c..dfa659b7e9 100644 --- a/oatdump/oatdump_test.h +++ b/oatdump/oatdump_test.h @@ -178,6 +178,11 @@ class OatDumpTest : public CommonRuntimeTest { expected_prefixes.push_back("InlineInfo"); } if (mode == kModeArt) { + 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("--image=" + core_art_location_); exec_argv.push_back("--instruction-set=" + std::string( GetInstructionSetString(kRuntimeISA))); |