summaryrefslogtreecommitdiffstats
path: root/oatdump
diff options
context:
space:
mode:
authorVladimir Marko <vmarko@google.com>2018-12-03 18:44:49 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2018-12-03 18:44:49 +0000
commitee45798b02c3a9fffa9c4b5c1fe0fe03a423df66 (patch)
tree61054ce8dae4b30654d41a1ba2f1394ef1c28484 /oatdump
parent9f27ffa9031431267ae59ee3469c853355811916 (diff)
parent00fe35e4021e9a8679eca3ffaede48fd89b56258 (diff)
downloadart-ee45798b02c3a9fffa9c4b5c1fe0fe03a423df66.tar.gz
art-ee45798b02c3a9fffa9c4b5c1fe0fe03a423df66.tar.bz2
art-ee45798b02c3a9fffa9c4b5c1fe0fe03a423df66.zip
Merge "Revert "Reduce core image to core-{oj,libart,simple}.""
Diffstat (limited to 'oatdump')
-rw-r--r--oatdump/oatdump_test.h9
1 files changed, 0 insertions, 9 deletions
diff --git a/oatdump/oatdump_test.h b/oatdump/oatdump_test.h
index 728939f93c..4ee510130b 100644
--- a/oatdump/oatdump_test.h
+++ b/oatdump/oatdump_test.h
@@ -122,10 +122,6 @@ 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()),
@@ -185,11 +181,6 @@ 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)));