commit 49cbd510f1f1502eb5df38ce485087555623d72b
author Vladimir Marko <vmarko@google.com> Mon Apr 06 10:38:58 2020 +0100
committer Vladimir Marko <vmarko@google.com> Tue Apr 07 09:36:54 2020 +0100
tree ffe233ba6ed42d3c15656b54c4760f8480219641
parent fc4165121b6343e674f3899784eeef367f3801fa

Pass updatable BCP packages to dex2oat.

(cherry picked from commit 79dc3c681f6d7a6bd9049092db27d3ca2d32785f)

Test: aosp_taimen-userdebug boots.
Test: Check logcat for the new argument in the dex2oat
      invocations that happen on first boot.
Bug: 151314205
Merged-In: I904fd0ba79350e01158321383b7b1fe5390caddf
Change-Id: I8307fa10dae832787a8ddaa20125423c3c2e47df

cmds/installd/dexopt.cpp

diff --git a/cmds/installd/dexopt.cpp b/cmds/installd/dexopt.cpp
index 1af6edd..5ee6a9f 100644
--- a/cmds/installd/dexopt.cpp
+++ b/cmds/installd/dexopt.cpp
@@ -374,6 +374,14 @@
         bool skip_compilation = vold_decrypt == "trigger_restart_min_framework" ||
                                 vold_decrypt == "1";
 
+        std::string updatable_bcp_packages =
+            MapPropertyToArg("dalvik.vm.dex2oat-updatable-bcp-packages-file",
+                             "--updatable-bcp-packages-file=%s");
+        if (updatable_bcp_packages.empty()) {
+          // Make dex2oat fail by providing non-existent file name.
+          updatable_bcp_packages = "--updatable-bcp-packages-file=/nonx/updatable-bcp-packages.txt";
+        }
+
         std::string resolve_startup_string_arg =
                 MapPropertyToArg("persist.device_config.runtime.dex2oat_resolve_startup_strings",
                                  "--resolve-startup-const-strings=%s");
@@ -520,6 +528,7 @@
         AddRuntimeArg(dex2oat_Xms_arg);
         AddRuntimeArg(dex2oat_Xmx_arg);
 
+        AddArg(updatable_bcp_packages);
         AddArg(resolve_startup_string_arg);
         AddArg(image_block_size_arg);
         AddArg(dex2oat_compiler_filter_arg);