commit 776ce74f23fb43008dd72668f45dd5ded1c22e17
author wangshumin <wangshumin@xiaomi.com> Wed May 08 12:52:39 2019 +0800
committer Vladimir Marko <vmarko@google.com> Fri May 10 05:03:42 2019 +0000
tree 67fa7ab45d6a24d64dd08c4f67da1034220ffc9b
parent 76da18e3ea49dd55f3f091a81173cf39f4628bfc

Use DEX2OATBOOTCLASSPATH to generate boot image

installd use DEX2OATBOOTCLASSPATH, so we need
use DEX2OATBOOTCLASSPATH to generate boot image,
otherwise the dexopt will fail when install apps.

Note that this is needed only for devices that
ship without boot image in /system.

Bug: 122937705

Signed-off-by: wangshumin <wangshumin@xiaomi.com>

(cherry picked from commit d6d878ef7f452335e6642265605de10220f7809f)

Change-Id: Ibb6a0e4145299b8c5fb1e7086449daae5c27622e
Merged-In: I19549d4ae19e8a530022625f53ca2334f33a0755

runtime/gc/space/image_space.cc

diff --git a/runtime/gc/space/image_space.cc b/runtime/gc/space/image_space.cc
index f9c159f..d037e1d 100644
--- a/runtime/gc/space/image_space.cc
+++ b/runtime/gc/space/image_space.cc
@@ -124,15 +124,31 @@
   std::string dex2oat(Runtime::Current()->GetCompilerExecutable());
   arg_vector.push_back(dex2oat);
 
+  char* dex2oat_bcp = getenv("DEX2OATBOOTCLASSPATH");
+  std::vector<std::string> dex2oat_bcp_vector;
+  if (dex2oat_bcp != nullptr) {
+    arg_vector.push_back("--runtime-arg");
+    arg_vector.push_back(StringPrintf("-Xbootclasspath:%s", dex2oat_bcp));
+    Split(dex2oat_bcp, ':', &dex2oat_bcp_vector);
+  }
+
   std::string image_option_string("--image=");
   image_option_string += image_filename;
   arg_vector.push_back(image_option_string);
 
-  const std::vector<std::string>& boot_class_path_locations = runtime->GetBootClassPathLocations();
-  DCHECK_EQ(boot_class_path.size(), boot_class_path_locations.size());
-  for (size_t i = 0u; i < boot_class_path.size(); i++) {
-    arg_vector.push_back(std::string("--dex-file=") + boot_class_path[i]);
-    arg_vector.push_back(std::string("--dex-location=") + boot_class_path_locations[i]);
+  if (!dex2oat_bcp_vector.empty()) {
+    for (size_t i = 0u; i < dex2oat_bcp_vector.size(); i++) {
+      arg_vector.push_back(std::string("--dex-file=") + dex2oat_bcp_vector[i]);
+      arg_vector.push_back(std::string("--dex-location=") + dex2oat_bcp_vector[i]);
+    }
+  } else {
+    const std::vector<std::string>& boot_class_path_locations =
+        runtime->GetBootClassPathLocations();
+    DCHECK_EQ(boot_class_path.size(), boot_class_path_locations.size());
+    for (size_t i = 0u; i < boot_class_path.size(); i++) {
+      arg_vector.push_back(std::string("--dex-file=") + boot_class_path[i]);
+      arg_vector.push_back(std::string("--dex-location=") + boot_class_path_locations[i]);
+    }
   }
 
   std::string oat_file_option_string("--oat-file=");