art: Refactor RuntimeOptions/ParsedOptions
Refactor the RuntimeOptions to be a
type-safe map (VariantMap, see runtime_options.h) and the ParsedOptions
to delegate the parsing to CmdlineParser (see cmdline/cmdline_parser.h).
This is the start of a command line parsing refactor, and may include
more in the future (dex2oat, patchoat, etc).
For more details of the command line parsing generator usage see cmdline/README.md
Change-Id: Ic67c6bca5e1f33bf2ec60e2e3ff8c366bab91563
diff --git a/runtime/common_runtime_test.h b/runtime/common_runtime_test.h
index 38a9733..9efea84 100644
--- a/runtime/common_runtime_test.h
+++ b/runtime/common_runtime_test.h
@@ -76,6 +76,9 @@
CommonRuntimeTest();
~CommonRuntimeTest();
+ // Gets the path of the libcore dex file.
+ static std::string GetLibCoreDexFileName();
+
protected:
static bool IsHost() {
return !kIsTargetBuild;
@@ -98,11 +101,8 @@
virtual void TearDown();
- // Gets the path of the libcore dex file.
- std::string GetLibCoreDexFileName();
-
// Gets the path of the specified dex file for host or target.
- std::string GetDexFileName(const std::string& jar_prefix);
+ static std::string GetDexFileName(const std::string& jar_prefix);
std::string GetTestAndroidRoot();