commit fbdc726e3b83ad46b8d53583ffb350119738402e
author Alex Light <allight@google.com> Mon Apr 26 16:48:18 2021 -0700
committer Alex Light <allight@google.com> Tue Apr 27 14:27:52 2021 -0700
tree ac586af9470c0cd2fb967493280f57b184303810
parent ea5434d32b293646a79f426396dab3c4b7b43ac9

Update BCP computation to use derive_classpath

We now dynamically compute the classpath during startup so we need to
invoke the 'derive_classpath' program that does this during OTA to
compile everything correctly.

Test: manual OTA on blueline
Bug: 186432034
Change-Id: Iaac6718d8347c671241fbdf08ff79b0a608ad000

cmds/installd/otapreopt_chroot.cpp

diff --git a/cmds/installd/otapreopt_chroot.cpp b/cmds/installd/otapreopt_chroot.cpp
index 83f01de..c62734a 100644
--- a/cmds/installd/otapreopt_chroot.cpp
+++ b/cmds/installd/otapreopt_chroot.cpp
@@ -275,6 +275,7 @@
     static constexpr const std::string_view kRequiredApexs[] = {
       "com.android.art",
       "com.android.runtime",
+      "com.android.sdkext",  // For derive_classpath
     };
     std::array<bool, arraysize(kRequiredApexs)> found_apexs{ false, false };
     DIR* apex_dir = opendir("/apex");