commit d308b3a6b07e6e5ed9060aba7472b362d76a8cd0
author Tao Bao <tbao@google.com> Wed Apr 03 17:59:57 2019 -0700
committer android-build-merger <android-build-merger@google.com> Wed Apr 03 17:59:57 2019 -0700
tree f1c2e6fc0854b2e4e5c39cc5986c8b31a084cddb
parent 7df2da5948d7751385b193bdc6e85a8e8b721536
parent 19d587d22cb5d4a29f418b38fae5425095a35aa1

Merge "libotautil exports libfstab header." am: 8e0821e690 am: 416343e73a
am: 19d587d22c

Change-Id: Id40eeb018b6ad5dfb0d5326b8c1144dba4788619

Android.bp

diff --git a/Android.bp b/Android.bp
index a44a2c6..fc8b139 100644
--- a/Android.bp
+++ b/Android.bp
@@ -75,7 +75,6 @@
 
         // external dependencies
         "libhealthhalutils",
-        "libfstab",
     ],
 }
 
@@ -153,7 +152,6 @@
 
     static_libs: [
         "libotautil",
-        "libfstab",
     ],
 
     init_rc: [
@@ -181,7 +179,6 @@
 
     static_libs: [
         "libotautil",
-        "libfstab",
     ],
 
     init_rc: [

fsck_unshare_blocks.cpp

diff --git a/fsck_unshare_blocks.cpp b/fsck_unshare_blocks.cpp
index e74f8ba..0f8fffa 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"
 

install/Android.bp

diff --git a/install/Android.bp b/install/Android.bp
index aa47990..095a6d0 100644
--- a/install/Android.bp
+++ b/install/Android.bp
@@ -43,7 +43,6 @@
         // external dependencies
         "libvintf_recovery",
         "libvintf",
-        "libfstab",
     ],
 }
 

otautil/Android.bp

diff --git a/otautil/Android.bp b/otautil/Android.bp
index b4936c0..c9ecba7 100644
--- a/otautil/Android.bp
+++ b/otautil/Android.bp
@@ -61,6 +61,10 @@
                 "libfs_mgr",
                 "libselinux",
             ],
+
+            export_static_lib_headers: [
+                "libfstab",
+            ],
         },
     },
 }