commit 22c2202e7555e905119c33cf866c659f81aaeb75
author Hridya Valsaraju <hridya@google.com> Mon Jul 23 17:44:32 2018 +0000
committer Hridya Valsaraju <hridya@google.com> Mon Jul 23 17:48:57 2018 +0000
tree 433371393006729336132acfc4393266444b868a
parent fbd79687e6980cced292108a64eab247fa6d612b

Revert "Use more shared libraries in adb and init."

This reverts commit fbd79687e6980cced292108a64eab247fa6d612b.

Reason for revert: b/111734137

Change-Id: I70e23ed20d16821a555b448d4ac76fe9e130afa5

fs_mgr/Android.bp

diff --git a/fs_mgr/Android.bp b/fs_mgr/Android.bp
index ce1595e..a3ce879 100644
--- a/fs_mgr/Android.bp
+++ b/fs_mgr/Android.bp
@@ -30,7 +30,7 @@
     ],
 }
 
-cc_library {
+cc_library_static {
     name: "libfs_mgr",
     defaults: ["fs_mgr_defaults"],
     recovery_available: true,
@@ -44,24 +44,18 @@
         "fs_mgr_avb_ops.cpp",
         "fs_mgr_dm_linear.cpp",
     ],
-    shared_libs: [
+    static_libs: [
         "libfec",
         "libfec_rs",
         "libbase",
         "libcrypto_utils",
         "libcrypto",
-        "libcutils",
         "libext4_utils",
-        "libkeyutils",
-        "liblog",
-        "liblogwrap",
         "libsquashfs_utils",
         "libselinux",
-    ],
-    static_libs: [
         "libavb",
-        "libdm",
         "libfstab",
+        "libdm",
         "liblp",
     ],
     export_static_lib_headers: [
@@ -71,8 +65,9 @@
     ],
     whole_static_libs: [
         "liblp",
-        "libfstab",
+        "liblogwrap",
         "libdm",
+        "libfstab",
     ],
     cppflags: [
         "-DALLOW_ADBD_DISABLE_VERITY=0",
@@ -87,7 +82,7 @@
     },
 }
 
-cc_library {
+cc_library_static {
     name: "libfstab",
     vendor_available: true,
     recovery_available: true,
@@ -98,7 +93,5 @@
         "fs_mgr_slotselect.cpp",
     ],
     export_include_dirs: ["include_fstab"],
-    shared_libs: [
-        "libbase",
-    ],
+    header_libs: ["libbase_headers"],
 }