commit 89d2d050a0c5784b7993eaaa08be21ef93084156
author David Anderson <dvander@google.com> Tue Oct 15 13:22:20 2019 -0700
committer David Anderson <dvander@google.com> Mon Nov 11 01:02:12 2019 +0000
tree c061a83a7a87ea5972015045433bb569b6e95e29
parent 405f4d3552803077fab8e5b184f1da475efef90c

Force merges to complete before wiping data or metadata.

After an OTA is applied, a wipe in recovery may overwrite components of
dynamic partitions living in userdata. If the OTA has not yet begun
merging, we mark the current slot unbootable. If the OTA has begun
merging, we wait for the merge to complete. This logic is encapsulated
in libsnapshot.

Bug: 139156011
Test: manual test
Change-Id: Id6544a1b8583afcbba11559d46214ec2e68ffa40

Android.bp

diff --git a/Android.bp b/Android.bp
index 45aafb0..7df53a4 100644
--- a/Android.bp
+++ b/Android.bp
@@ -58,12 +58,16 @@
     ],
 
     shared_libs: [
+        "android.hardware.boot@1.0",
+        "android.hardware.boot@1.1",
         "libbase",
         "libbootloader_message",
         "libcrypto",
         "libcutils",
         "libfs_mgr",
+        "liblp",
         "liblog",
+        "libprotobuf-cpp-lite",
         "libziparchive",
     ],
 
@@ -73,6 +77,7 @@
         "libminui",
         "librecovery_utils",
         "libotautil",
+        "libsnapshot_nobinder",
     ],
 }