Revert "Full-stack integrity: check vdex contents."

bug: 30972906

Test fails on device.

This reverts commit d6f914ea4bd09f2d60db2783f7a3fd93d3ec0afb.

Change-Id: I53902b0d6d4dbe8237f61bf01542acf538229c71

1 files changed, 1 insertions, 14 deletions

diff --git a/runtime/oat_file_assistant.cc b/runtime/oat_file_assistant.cc
index 6bf05b77a8..0170073e29 100644
--- a/runtime/oat_file_assistant.cc
+++ b/runtime/oat_file_assistant.cc
@@ -515,18 +515,6 @@ OatFileAssistant::OatStatus OatFileAssistant::GivenOatFileStatus(const OatFile&
     VLOG(oat) << "Image checksum test skipped for compiler filter " << current_compiler_filter;
   }
 
-  // zip_file_only_contains_uncompressed_dex_ is only set during fetching the dex checksums.
-  DCHECK(required_dex_checksums_attempted_);
-  if (only_load_system_executable_ &&
-      !LocationIsOnSystem(file.GetLocation().c_str()) &&
-      file.ContainsDexCode() &&
-      zip_file_only_contains_uncompressed_dex_) {
-    LOG(ERROR) << "Not loading "
-               << dex_location_
-               << ": oat file has dex code, but APK has uncompressed dex code";
-    return kOatDexOutOfDate;
-  }
-
   if (CompilerFilter::IsAotCompilationEnabled(current_compiler_filter)) {
     if (!file.IsPic()) {
       const ImageInfo* image_info = GetImageInfo();
@@ -891,8 +879,7 @@ const std::vector<uint32_t>* OatFileAssistant::GetRequiredDexChecksums() {
     if (dex_file_loader.GetMultiDexChecksums(dex_location_.c_str(),
                                              &cached_required_dex_checksums_,
                                              &error_msg,
-                                             zip_fd_,
-                                             &zip_file_only_contains_uncompressed_dex_)) {
+                                             zip_fd_)) {
       required_dex_checksums_found_ = true;
       has_original_dex_files_ = true;
     } else {