commit 5751dc831ffd8acb089c2aff2e2ddf18f89da975
author Nicolas Geoffray <ngeoffray@google.com> Fri Oct 27 10:08:58 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Oct 27 10:08:58 2017 +0000
tree bdbf90587d3c0aaa42a2276db06bd1ddeb3cb2c0
parent dc02d53eeea1c80d4f77cc66a00c42d398a04c18
parent e875f4c210ce0598e47b6d66ec12cd7c60208844

Merge "Don't verify dex file when the runtime is in NoVerify mode."

runtime/class_loader_context.cc

diff --git a/runtime/class_loader_context.cc b/runtime/class_loader_context.cc
index 5510743..38f59ef 100644
--- a/runtime/class_loader_context.cc
+++ b/runtime/class_loader_context.cc
@@ -230,7 +230,7 @@
       // contents. So pass true to verify_checksum.
       if (!DexFileLoader::Open(location.c_str(),
                                location.c_str(),
-                               /*verify*/ true,
+                               Runtime::Current()->IsVerificationEnabled(),
                                /*verify_checksum*/ true,
                                &error_msg,
                                &info.opened_dex_files)) {

runtime/oat_file_manager.cc

diff --git a/runtime/oat_file_manager.cc b/runtime/oat_file_manager.cc
index a3cbe95..940195c 100644
--- a/runtime/oat_file_manager.cc
+++ b/runtime/oat_file_manager.cc
@@ -599,7 +599,7 @@
         static constexpr bool kVerifyChecksum = true;
         if (!DexFileLoader::Open(dex_location,
                                  dex_location,
-                                 /*verify*/ true,
+                                 Runtime::Current()->IsVerificationEnabled(),
                                  kVerifyChecksum,
                                  /*out*/ &error_msg,
                                  &dex_files)) {

runtime/runtime.cc

diff --git a/runtime/runtime.cc b/runtime/runtime.cc
index 9d16f57..c88799c 100644
--- a/runtime/runtime.cc
+++ b/runtime/runtime.cc
@@ -1024,8 +1024,12 @@
       LOG(WARNING) << "Skipping non-existent dex file '" << dex_filename << "'";
       continue;
     }
-    if (!DexFileLoader::Open(
-          dex_filename, dex_location, /* verify */ true, kVerifyChecksum, &error_msg, dex_files)) {
+    if (!DexFileLoader::Open(dex_filename,
+                             dex_location,
+                             Runtime::Current()->IsVerificationEnabled(),
+                             kVerifyChecksum,
+                             &error_msg,
+                             dex_files)) {
       LOG(WARNING) << "Failed to open .dex from file '" << dex_filename << "': " << error_msg;
       ++failure_count;
     }