Add ISA directory to image and odex pathnames.
Bug: 14882223
Bug: 14694978
Change-Id: Ic1b5ae836b8e91ea461dcd4f3da8e38dc3bec00f
diff --git a/runtime/gc/space/image_space.cc b/runtime/gc/space/image_space.cc
index 446f898..2a717cb 100644
--- a/runtime/gc/space/image_space.cc
+++ b/runtime/gc/space/image_space.cc
@@ -103,8 +103,11 @@
const InstructionSet image_isa,
std::string* image_filename,
bool *is_system) {
- if (OS::FileExists(image_location)) {
- *image_filename = image_location;
+ // image_location = /system/framework/boot.art
+ // system_image_location = /system/framework/<image_isa>/boot.art
+ std::string system_image_filename(GetSystemImageFilename(image_location, image_isa));
+ if (OS::FileExists(system_image_filename.c_str())) {
+ *image_filename = system_image_filename;
*is_system = true;
return true;
}
@@ -113,6 +116,9 @@
// Always set output location even if it does not exist,
// so that the caller knows where to create the image.
+ //
+ // image_location = /system/framework/boot.art
+ // *image_filename = /data/dalvik-cache/<image_isa>/boot.art
*image_filename = GetDalvikCacheFilenameOrDie(image_location, dalvik_cache.c_str());
*is_system = false;
return OS::FileExists(image_filename->c_str());