From cecad743c1225bc203085e04cc70b54bcd51c374 Mon Sep 17 00:00:00 2001
From: Tao Bao <tbao@google.com>
Date: Wed, 3 Apr 2019 11:35:51 -0700
Subject: libotautil exports libfstab header.

otautil/roots.h includes <fstab/fstab.h>, but users of otautil/roots.h
don't need to explicitly depend on libfstab unless they have a real
need.

Also remove the unneeded include of <fstab/fstab.h> from
fsck_unshare_blocks.cpp.

Test: mmma -j bootable/recovery
Change-Id: Id3dc995a4769e631ab242843ee439bd94b2bf0bc
---
 Android.bp              | 3 ---
 fsck_unshare_blocks.cpp | 1 -
 install/Android.bp      | 1 -
 otautil/Android.bp      | 4 ++++
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/Android.bp b/Android.bp
index a44a2c625..fc8b139a2 100644
--- 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: [
diff --git a/fsck_unshare_blocks.cpp b/fsck_unshare_blocks.cpp
index e74f8ba6f..0f8ffface 100644
--- 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"
 
diff --git a/install/Android.bp b/install/Android.bp
index aa47990ae..095a6d027 100644
--- a/install/Android.bp
+++ b/install/Android.bp
@@ -43,7 +43,6 @@ cc_defaults {
         // external dependencies
         "libvintf_recovery",
         "libvintf",
-        "libfstab",
     ],
 }
 
diff --git a/otautil/Android.bp b/otautil/Android.bp
index b4936c08b..c9ecba788 100644
--- a/otautil/Android.bp
+++ b/otautil/Android.bp
@@ -61,6 +61,10 @@ cc_library_static {
                 "libfs_mgr",
                 "libselinux",
             ],
+
+            export_static_lib_headers: [
+                "libfstab",
+            ],
         },
     },
 }
-- 
cgit v1.2.3