commit 18962a88bc478f414e2e155cf1840cba596dd110
author Yifan Hong <elsk@google.com> Tue Sep 17 16:10:24 2019 -0700
committer Yifan Hong <elsk@google.com> Mon Sep 23 18:50:12 2019 -0700
tree b9b766a1ce506e0ce542c2af7d33fb1932a35e2c
parent 5f830c6b764e3cd1c3fe153470056b4882c41508

snapshotctl: merge when boot

Test: reboot after OTA on virtual A/B device, see merge
Bug: 135752105

Change-Id: I92eb8d0961635008366c336ead40e3038173257f

fs_mgr/libsnapshot/Android.bp

diff --git a/fs_mgr/libsnapshot/Android.bp b/fs_mgr/libsnapshot/Android.bp
index 0c32c15..a012099 100644
--- a/fs_mgr/libsnapshot/Android.bp
+++ b/fs_mgr/libsnapshot/Android.bp
@@ -136,4 +136,7 @@
         "liblog",
         "liblp",
     ],
+    init_rc: [
+        "snapshotctl.rc",
+    ],
 }

fs_mgr/libsnapshot/snapshotctl.rc

diff --git a/fs_mgr/libsnapshot/snapshotctl.rc b/fs_mgr/libsnapshot/snapshotctl.rc
new file mode 100644
index 0000000..29707f1
--- /dev/null
+++ b/fs_mgr/libsnapshot/snapshotctl.rc
@@ -0,0 +1,2 @@
+on property:sys.boot_completed=1
+    exec - root root -- /system/bin/snapshotctl merge --logcat