diff options
| author | 2015-11-12 11:49:06 +0000 | |
|---|---|---|
| committer | 2015-11-12 11:52:42 +0000 | |
| commit | d1ef4362bf799f9f5d50e5edef8433664b503051 (patch) | |
| tree | 59aaa140925efa790f787d5e1caf6d0cafd6ae15 /runtime/common_runtime_test.h | |
| parent | e4cf5892c2a244034900d49499c071b255571bba (diff) | |
| parent | f32e8327da5dd33abe18662fbca5e584cd047816 (diff) | |
Merge lmp changes into mnc.
Most merge conflicts are due to changes in the string representation.
They have been resolved in favour of "mnc-dev" since we've changed
the string representation there. Other changes relate to the
fact that there are now two jars in libcore (core-oj and core-libart).
Change-Id: I1fcc6e5f8dab8d1954dcddca0493563e7677d433
Diffstat (limited to 'runtime/common_runtime_test.h')
| -rw-r--r-- | runtime/common_runtime_test.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/runtime/common_runtime_test.h b/runtime/common_runtime_test.h index 34fdd8d76a..23926fdc91 100644 --- a/runtime/common_runtime_test.h +++ b/runtime/common_runtime_test.h @@ -77,8 +77,8 @@ class CommonRuntimeTest : public testing::Test { CommonRuntimeTest(); ~CommonRuntimeTest(); - // Gets the path of the libcore dex file. - static std::string GetLibCoreDexFileName(); + // Gets the paths of the libcore dex files. + static std::vector<std::string> GetLibCoreDexFileNames(); // Returns bin directory which contains host's prebuild tools. static std::string GetAndroidHostToolsDir(); |