commit e7ce821d3d4699fc01d8d49dded9ae5d853012bf
author David Anderson <dvander@google.com> Mon Dec 16 20:13:19 2019 -0800
committer David Anderson <dvander@google.com> Tue Dec 24 04:36:59 2019 +0000
tree 5ad6bf4f3222cb0ef5c6f0025e2252dde9aa775f
parent 60f3a238b23e0cbaa76b7a0a5d7d99a5d8ff8035

Use libfs_mgr_binder when linking to binder-enabled libsnapshot.

Bug: 134949511
Test: builds
Change-Id: I6fe9788ac69b9c9ffe67a65c877c3e4beaf7a56e

Android.bp

diff --git a/Android.bp b/Android.bp
index 9d6ec7c..e457cd1 100644
--- a/Android.bp
+++ b/Android.bp
@@ -195,12 +195,14 @@
     defaults: ["update_metadata-protos_exports"],
 
     static_libs: [
+        "libcutils",
+        "libfs_mgr_binder",
+        "libgsi",
         "libsnapshot",
         "update_metadata-protos",
     ],
     shared_libs: [
         "libbootloader_message",
-        "libfs_mgr",
         "libhidlbase",
         "liblp",
         "libutils",
@@ -209,8 +211,14 @@
     ],
     target: {
         recovery: {
-            static_libs: ["libsnapshot_nobinder"],
-            exclude_static_libs: ["libsnapshot"],
+            static_libs: [
+                "libfs_mgr",
+                "libsnapshot_nobinder",
+            ],
+            exclude_static_libs: [
+                "libfs_mgr_binder",
+                "libsnapshot",
+            ],
         },
     },
 }