Revert "Reduce multidex checksum to single scalar value."

This reverts commit fdfa590b7b43ca70e497f1a8afe9a641b57ece56.

Reason for revert: b/289784075

Change-Id: Ib114ca32dac6d1aaced372334873bfa12f74d572

1 files changed, 7 insertions, 5 deletions

diff --git a/runtime/oat_file_assistant.h b/runtime/oat_file_assistant.h
index 922dbf3e04..54287eb5f1 100644
--- a/runtime/oat_file_assistant.h
+++ b/runtime/oat_file_assistant.h
@@ -494,9 +494,11 @@ class OatFileAssistant {
   // location.
   OatStatus GivenOatFileStatus(const OatFile& file);
 
-  // Gets the dex checksum required for an up-to-date oat file.
-  // Returns cached result from GetMultiDexChecksum.
-  bool GetRequiredDexChecksum(std::optional<uint32_t>* checksum, std::string* error);
+  // Gets the dex checksums required for an up-to-date oat file.
+  // Returns cached_required_dex_checksums if the required checksums were located. Returns an empty
+  // list if `dex_location_` refers to a zip and there is no dex file in it. Returns nullptr if an
+  // error occurred. The caller shouldn't clean up or free the returned pointer.
+  const std::vector<uint32_t>* GetRequiredDexChecksums(std::string* error_msg);
 
   // Returns whether there is at least one boot image usable.
   bool IsPrimaryBootImageUsable();
@@ -553,8 +555,8 @@ class OatFileAssistant {
 
   // Cached value of the required dex checksums.
   // This should be accessed only by the GetRequiredDexChecksums() method.
-  std::optional<uint32_t> cached_required_dex_checksums_;
-  std::optional<std::string> cached_required_dex_checksums_error_;
+  std::optional<std::vector<uint32_t>> cached_required_dex_checksums_;
+  std::string cached_required_dex_checksums_error_;
   bool required_dex_checksums_attempted_ = false;
 
   // The AOT-compiled file of an app when the APK of the app is in /data.