commit fd336c344058274fada3c48fbd356befca285b9a
author Jeff Hao <jeffhao@google.com> Thu Apr 07 19:46:31 2016 -0700
committer Jeff Hao <jeffhao@google.com> Thu Apr 07 20:10:48 2016 -0700
tree ab0ee61612979e51aa830ce7d5faeae7dadf0315
parent b11ffb7f33d70da0eb2caf891bbfdab9129fe5b4

Fix combined checksum calculation to use isa.

Bug: 28054110

(cherry-picked from commit 8bbda8e683a1933755d0b8a68fed620cd63148ee)

Change-Id: I228db6ea1003e4e70d6a5fa7345d56409e70bd87

runtime/oat_file_assistant.h

diff --git a/runtime/oat_file_assistant.h b/runtime/oat_file_assistant.h
index 63b1573..d3228de 100644
--- a/runtime/oat_file_assistant.h
+++ b/runtime/oat_file_assistant.h
@@ -279,7 +279,7 @@
   static bool DexFilenameToOdexFilename(const std::string& location,
       InstructionSet isa, std::string* odex_filename, std::string* error_msg);
 
-  static uint32_t CalculateCombinedImageChecksum();
+  static uint32_t CalculateCombinedImageChecksum(InstructionSet isa = kRuntimeISA);
 
  private:
   struct ImageInfo {