commit 99fc9389d08c83de66b6f1ca44bd1820329600a6
author Nicolas Geoffray <ngeoffray@google.com> Wed Feb 20 13:17:27 2019 +0000
committer Nicolas Geoffray <ngeoffray@google.com> Fri Feb 22 13:09:40 2019 +0000
tree 2cc61c6e3e7984939e88ce4922886bcef18e0fa4
parent c76c4cc4230f78aaa15decc94f28ec7de3c3aa02

Trust that boot classpath dex files don't need on device dex file verification.

Bug: 119800099
Test: boots
Change-Id: I6d48a38945d601a3d74ebde2496c1446711c35fe

runtime/runtime.cc

diff --git a/runtime/runtime.cc b/runtime/runtime.cc
index 5173f4d..f5443c8 100644
--- a/runtime/runtime.cc
+++ b/runtime/runtime.cc
@@ -1006,9 +1006,9 @@
   VLOG(startup) << "Runtime::StartDaemonThreads exiting";
 }
 
-static size_t OpenDexFiles(ArrayRef<const std::string> dex_filenames,
-                           ArrayRef<const std::string> dex_locations,
-                           std::vector<std::unique_ptr<const DexFile>>* dex_files) {
+static size_t OpenBootDexFiles(ArrayRef<const std::string> dex_filenames,
+                               ArrayRef<const std::string> dex_locations,
+                               std::vector<std::unique_ptr<const DexFile>>* dex_files) {
   DCHECK(dex_files != nullptr) << "OpenDexFiles: out-param is nullptr";
   size_t failure_count = 0;
   const ArtDexFileLoader dex_file_loader;
@@ -1021,9 +1021,15 @@
       LOG(WARNING) << "Skipping non-existent dex file '" << dex_filename << "'";
       continue;
     }
+    // In the case we're not using the default boot image, we don't have support yet
+    // on reading vdex files of boot classpath. So just assume all boot classpath
+    // dex files have been verified (this should always be the case as the default boot
+    // image has been generated at build time).
+    bool verify = Runtime::Current()->IsVerificationEnabled() &&
+        (kIsDebugBuild || Runtime::Current()->IsUsingDefaultBootImageLocation());
     if (!dex_file_loader.Open(dex_filename,
                               dex_location,
-                              Runtime::Current()->IsVerificationEnabled(),
+                              verify,
                               kVerifyChecksum,
                               &error_msg,
                               dex_files)) {
@@ -1486,9 +1492,9 @@
       if (runtime_options.Exists(Opt::BootClassPathDexList)) {
         extra_boot_class_path.swap(*runtime_options.GetOrDefault(Opt::BootClassPathDexList));
       } else {
-        OpenDexFiles(ArrayRef<const std::string>(GetBootClassPath()).SubArray(start),
-                     ArrayRef<const std::string>(GetBootClassPathLocations()).SubArray(start),
-                     &extra_boot_class_path);
+        OpenBootDexFiles(ArrayRef<const std::string>(GetBootClassPath()).SubArray(start),
+                         ArrayRef<const std::string>(GetBootClassPathLocations()).SubArray(start),
+                         &extra_boot_class_path);
       }
       class_linker_->AddExtraBootDexFiles(self, std::move(extra_boot_class_path));
     }
@@ -1504,9 +1510,9 @@
     if (runtime_options.Exists(Opt::BootClassPathDexList)) {
       boot_class_path.swap(*runtime_options.GetOrDefault(Opt::BootClassPathDexList));
     } else {
-      OpenDexFiles(ArrayRef<const std::string>(GetBootClassPath()),
-                   ArrayRef<const std::string>(GetBootClassPathLocations()),
-                   &boot_class_path);
+      OpenBootDexFiles(ArrayRef<const std::string>(GetBootClassPath()),
+                       ArrayRef<const std::string>(GetBootClassPathLocations()),
+                       &boot_class_path);
     }
     if (!class_linker_->InitWithoutImage(std::move(boot_class_path), &error_msg)) {
       LOG(ERROR) << "Could not initialize without image: " << error_msg;