Follow up to "Add ISA directory to image and odex pathnames."
Change-Id: I7f08cc3052fbed93a56ccf1ab7675ae8bc129da9
diff --git a/runtime/utils.cc b/runtime/utils.cc
index 02b955a..c705701 100644
--- a/runtime/utils.cc
+++ b/runtime/utils.cc
@@ -1204,7 +1204,7 @@
return StringPrintf("%s/%s", cache_location, cache_file.c_str());
}
-static void InsertIsaDirectory(std::string* filename, const InstructionSet isa) {
+static void InsertIsaDirectory(const InstructionSet isa, std::string* filename) {
// in = /foo/bar/baz
// out = /foo/bar/<isa>/baz
size_t pos = filename->rfind('/');
@@ -1217,7 +1217,7 @@
// location = /system/framework/boot.art
// filename = /system/framework/<isa>/boot.art
std::string filename(location);
- InsertIsaDirectory(&filename, isa);
+ InsertIsaDirectory(isa, &filename);
return filename;
}
@@ -1226,7 +1226,7 @@
// odex_location = /foo/bar/<isa>/baz.odex
CHECK_GE(location.size(), 4U) << location; // must be at least .123
std::string odex_location(location);
- InsertIsaDirectory(&odex_location, isa);
+ 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;
odex_location.resize(dot_index + 1);