commit 94b41806834afe4ae281bc1ad43cc3353ddbe15e
author Roland Levillain <rpl@google.com> Fri Jan 18 11:56:50 2019 +0000
committer Roland Levillain <rpl@google.com> Tue Jan 22 18:30:58 2019 +0000
tree 20f7c62754b12147815082c4d49c3328cdbb1365
parent 370222c120cc2bdcbf77860f5ba83a501a4d2dfb

Implement a tear-down phase in otapreopt_chroot.

Collect the list of APEX packages activated by `otapreopt_chroot` and
deactivate them after executing `otapreopt` (in its own process).

Also share android::installd::Exec between `otapreopt` and
`otapreopt_chroot`.

This tear-down phase ensures loop devices associated during by
`otapreopt_chroot` are detached before `otapreopt_chroot` exits.

Test: m otapreopt_chroot
Test: A/B OTA update test (asit/dexoptota/self_full).
Bug: 113373927
Bug: 120796514
Change-Id: I236ac49bb698fb672e7a4f9de9903229e535e9c6

cmds/installd/Android.bp

diff --git a/cmds/installd/Android.bp b/cmds/installd/Android.bp
index 85652b3..95f5efb 100644
--- a/cmds/installd/Android.bp
+++ b/cmds/installd/Android.bp
@@ -136,7 +136,10 @@
     ],
     clang: true,
 
-    srcs: ["otapreopt_chroot.cpp"],
+    srcs: [
+        "otapreopt_chroot.cpp",
+        "otapreopt_utils.cpp",
+    ],
     shared_libs: [
         "libbase",
         "liblog",
@@ -197,6 +200,7 @@
         "dexopt.cpp",
         "globals.cpp",
         "otapreopt.cpp",
+        "otapreopt_utils.cpp",
         "utils.cpp",
     ],