diff options
| author | Vladimir Marko <vmarko@google.com> | 2018-12-03 14:50:46 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-12-03 14:50:46 +0000 |
| commit | e239cdc2239b69199d2eab4b2943636be8ceb2ba (patch) | |
| tree | 4f53232e73c9feaf60c0dcf123068875afd26a9e /oatdump | |
| parent | 8bda21f1d8bbc1060bf693f5d1666d3396d1cb69 (diff) | |
| parent | ec91d48cade73c54f7a03c5d53d863bc2490976e (diff) | |
| download | art-e239cdc2239b69199d2eab4b2943636be8ceb2ba.tar.gz art-e239cdc2239b69199d2eab4b2943636be8ceb2ba.tar.bz2 art-e239cdc2239b69199d2eab4b2943636be8ceb2ba.zip | |
Merge "Reduce core image to core-{oj,libart,simple}."
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))); |