Merge "libotautil exports libfstab header." am: 8e0821e690

am: 416343e73a Change-Id: I5abbf4631d23b5dd3dd0ceda62442d26d4e928ae
2019-04-03 17:29:10 -07:00
parent 5fa37b77d1 416343e73a
commit 19d587d22c
4 changed files with 4 additions and 5 deletions
--- a/Android.bp
+++ b/Android.bp
@@ -75,7 +75,6 @@ cc_defaults {

        // external dependencies
        "libhealthhalutils",
-        "libfstab",
    ],
 }

@@ -153,7 +152,6 @@ cc_binary {

    static_libs: [
        "libotautil",
-        "libfstab",
    ],

    init_rc: [
@@ -181,7 +179,6 @@ cc_binary {

    static_libs: [
        "libotautil",
-        "libfstab",
    ],

    init_rc: [
--- a/fsck_unshare_blocks.cpp
+++ b/fsck_unshare_blocks.cpp
@@ -34,7 +34,6 @@
 #include <android-base/logging.h>
 #include <android-base/properties.h>
 #include <android-base/unique_fd.h>
-#include <fstab/fstab.h>

 #include "otautil/roots.h"

--- a/install/Android.bp
+++ b/install/Android.bp
@@ -43,7 +43,6 @@ cc_defaults {
        // external dependencies
        "libvintf_recovery",
        "libvintf",
-        "libfstab",
    ],
 }

--- a/otautil/Android.bp
+++ b/otautil/Android.bp
@@ -61,6 +61,10 @@ cc_library_static {
                "libfs_mgr",
                "libselinux",
            ],
+
+            export_static_lib_headers: [
+                "libfstab",
+            ],
        },
    },
 }