diff options
| author | 2014-09-19 07:33:46 +0000 | |
|---|---|---|
| committer | 2014-09-19 07:33:46 +0000 | |
| commit | 323fe34f5c26848a37720b2ec42d8b15fb8410c0 (patch) | |
| tree | ab9a9a426a371de0c32e48a85fdda44a321a06a0 /patchoat/patchoat.cc | |
| parent | 5cdd0734d2f79eedc530f5f1e876cd2110e29c86 (diff) | |
| parent | 3c13a794845e0cf7887e33b2ec20de7e6ba85f8f (diff) | |
Merge "ART: Only allow the zygote to create the global boot image"
Diffstat (limited to 'patchoat/patchoat.cc')
| -rw-r--r-- | patchoat/patchoat.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/patchoat/patchoat.cc b/patchoat/patchoat.cc index f89a4f7122..50b4ece69f 100644 --- a/patchoat/patchoat.cc +++ b/patchoat/patchoat.cc @@ -79,9 +79,10 @@ static bool LocationToFilename(const std::string& location, InstructionSet isa, bool have_android_data = false; bool dalvik_cache_exists = false; + bool is_global_cache = false; std::string dalvik_cache; GetDalvikCache(GetInstructionSetString(isa), false, &dalvik_cache, - &have_android_data, &dalvik_cache_exists); + &have_android_data, &dalvik_cache_exists, &is_global_cache); std::string cache_filename; if (have_android_data && dalvik_cache_exists) { @@ -986,9 +987,11 @@ static int patchoat(int argc, char **argv) { std::string cache_filename; bool has_cache = false; bool has_android_data_unused = false; + bool is_global_cache = false; if (!gc::space::ImageSpace::FindImageFilename(patched_image_location.c_str(), isa, &system_filename, &has_system, &cache_filename, - &has_android_data_unused, &has_cache)) { + &has_android_data_unused, &has_cache, + &is_global_cache)) { Usage("Unable to determine image file for location %s", patched_image_location.c_str()); } if (has_cache) { |