commit 35d7d4cac38aa3969a866012d0dd9d74e064d968
author Nikita Ioffe <ioffe@google.com> Wed Mar 03 19:21:06 2021 +0000
committer Alex Light <allight@google.com> Wed Mar 03 22:05:40 2021 +0000
tree 2375569e963812db64bd2526478c2cc2e45560ab
parent e9b81a40004a1996f57976d30b99749abcf89580

Populate ApexFileRepository before activating apexes

Test: presubmit
Test: Manual OTA of cuttlefish
Bug: 181182967
Change-Id: Icedec8cc45a20c5eb7c33fffec50b8887b9b7735

cmds/installd/otapreopt_chroot.cpp

diff --git a/cmds/installd/otapreopt_chroot.cpp b/cmds/installd/otapreopt_chroot.cpp
index 72c03bf..fb07840 100644
--- a/cmds/installd/otapreopt_chroot.cpp
+++ b/cmds/installd/otapreopt_chroot.cpp
@@ -28,6 +28,7 @@
 #include <libdm/dm.h>
 #include <selinux/android.h>
 
+#include <apex_file_repository.h>
 #include <apexd.h>
 
 #include "installd_constants.h"
@@ -64,11 +65,14 @@
     // system/apex/apexd/apexd.cpp.
     //
     // Only scan the APEX directory under /system, /system_ext and /vendor (within the chroot dir).
-    std::vector<const char*> apex_dirs{apex::kApexPackageSystemDir, apex::kApexPackageSystemExtDir,
+    std::vector<std::string> apex_dirs{apex::kApexPackageSystemDir, apex::kApexPackageSystemExtDir,
                                        apex::kApexPackageVendorDir};
+    // Initialize ApexFileRepository used internally in ScanPackagesDirAndActivate.
+    // This is a quick fix to fix apex activation in otapreopt_chroot.
+    apex::ApexFileRepository::GetInstance().AddPreInstalledApex(apex_dirs);
     for (const auto& dir : apex_dirs) {
         // Cast call to void to suppress warn_unused_result.
-        static_cast<void>(apex::ScanPackagesDirAndActivate(dir));
+        static_cast<void>(apex::ScanPackagesDirAndActivate(dir.c_str()));
     }
     return apex::GetActivePackages();
 }