From 89d2d050a0c5784b7993eaaa08be21ef93084156 Mon Sep 17 00:00:00 2001 From: David Anderson Date: Tue, 15 Oct 2019 13:22:20 -0700 Subject: 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 | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'Android.bp') diff --git a/Android.bp b/Android.bp index 45aafb043..7df53a43a 100644 --- a/Android.bp +++ b/Android.bp @@ -58,12 +58,16 @@ cc_defaults { ], 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 @@ cc_defaults { "libminui", "librecovery_utils", "libotautil", + "libsnapshot_nobinder", ], } -- cgit v1.2.3