diff options
| -rw-r--r-- | runtime/utils.cc | 12 | ||||
| -rw-r--r-- | runtime/utils.h | 3 | ||||
| -rw-r--r-- | runtime/utils_test.cc | 2 |
3 files changed, 11 insertions, 6 deletions
diff --git a/runtime/utils.cc b/runtime/utils.cc index 6afc373f9..d09f27a21 100644 --- a/runtime/utils.cc +++ b/runtime/utils.cc @@ -1519,14 +1519,16 @@ std::string GetSystemImageFilename(const char* location, const InstructionSet is std::string DexFilenameToOdexFilename(const std::string& location, const InstructionSet isa) { // location = /foo/bar/baz.jar // odex_location = /foo/bar/<isa>/baz.odex - - CHECK_GE(location.size(), 4U) << location; // must be at least .123 std::string odex_location(location); InsertIsaDirectory(isa, &odex_location); - size_t dot_index = odex_location.size() - 3 - 1; // 3=dex or zip or apk - CHECK_EQ('.', odex_location[dot_index]) << location; + size_t dot_index = odex_location.rfind('.'); + + // The location must have an extension, otherwise it's not clear what we + // should return. + CHECK_NE(dot_index, std::string::npos) << odex_location; + CHECK_EQ(std::string::npos, odex_location.find('/', dot_index)) << odex_location; + odex_location.resize(dot_index + 1); - CHECK_EQ('.', odex_location[odex_location.size()-1]) << location << " " << odex_location; odex_location += "odex"; return odex_location; } diff --git a/runtime/utils.h b/runtime/utils.h index 698d686af..9d04d35e2 100644 --- a/runtime/utils.h +++ b/runtime/utils.h @@ -516,8 +516,9 @@ std::string GetDalvikCacheFilenameOrDie(const char* file_location, // Returns the system location for an image std::string GetSystemImageFilename(const char* location, InstructionSet isa); -// Returns an .odex file name next adjacent to the dex location. +// Returns an .odex file name adjacent to the dex location. // For example, for "/foo/bar/baz.jar", return "/foo/bar/<isa>/baz.odex". +// The dex location must include a directory component and have an extension. // Note: does not support multidex location strings. std::string DexFilenameToOdexFilename(const std::string& location, InstructionSet isa); diff --git a/runtime/utils_test.cc b/runtime/utils_test.cc index a3dd13c66..5465762fd 100644 --- a/runtime/utils_test.cc +++ b/runtime/utils_test.cc @@ -374,6 +374,8 @@ TEST_F(UtilsTest, GetSystemImageFilename) { TEST_F(UtilsTest, DexFilenameToOdexFilename) { EXPECT_STREQ("/foo/bar/arm/baz.odex", DexFilenameToOdexFilename("/foo/bar/baz.jar", kArm).c_str()); + EXPECT_STREQ("/foo/bar/arm/baz.odex", + DexFilenameToOdexFilename("/foo/bar/baz.funnyext", kArm).c_str()); } TEST_F(UtilsTest, ExecSuccess) { |