commit 536c6454d075797127e20458df730328dfe8d7a5
author Akilesh Kailash <akailash@google.com> Fri Aug 30 21:45:34 2024 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Aug 30 21:45:34 2024 +0000
tree 8263a2bbe46b3c5f3e404f498e07325c9ff0ad53
parent a0f06f9d29c06e61f4f2cc242d0353ce05558e38
parent 76a1e0ecdf8027054e472ad4aebab2389d497397

Merge "libsnapshot: static link libselinux" into main am: 0049369534 am: 76a1e0ecdf

Original change: https://android-review.googlesource.com/c/platform/system/core/+/3251031

Change-Id: Idc40726749233d6c4da4bd08ead3e28feb0b7f7a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

fs_mgr/libsnapshot/Android.bp

diff --git a/fs_mgr/libsnapshot/Android.bp b/fs_mgr/libsnapshot/Android.bp
index f98b2b5..50efb03 100644
--- a/fs_mgr/libsnapshot/Android.bp
+++ b/fs_mgr/libsnapshot/Android.bp
@@ -46,7 +46,6 @@
         "libfstab",
         "libsnapuserd_client",
         "libz",
-        "libselinux",
     ],
     header_libs: [
         "libfiemap_headers",
@@ -112,6 +111,9 @@
     static_libs: [
         "libfs_mgr_binder",
     ],
+    whole_static_libs: [
+        "libselinux",
+    ],
 }
 
 cc_library {
@@ -130,6 +132,9 @@
     static_libs: [
         "libsnapshot_cow",
     ],
+    whole_static_libs: [
+        "libselinux",
+    ],
 }
 
 cc_library_static {
@@ -144,6 +149,7 @@
     ],
     static_libs: [
         "libfs_mgr",
+        "libselinux",
     ],
 }
 
@@ -161,6 +167,9 @@
     static_libs: [
         "libfs_mgr",
     ],
+    whole_static_libs: [
+        "libselinux",
+    ],
 }
 
 cc_defaults {
@@ -243,6 +252,7 @@
         "libfs_mgr",
         "libgmock",
         "libgtest",
+        "libselinux",
     ],
 }