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

am: 416343e73a

Change-Id: I5abbf4631d23b5dd3dd0ceda62442d26d4e928ae

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: [

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

@@ -43,7 +43,6 @@ cc_defaults {
         // external dependencies
         "libvintf_recovery",
         "libvintf",
-        "libfstab",
     ],
 }
 

otautil/Android.bp

@@ -61,6 +61,10 @@ cc_library_static {
                 "libfs_mgr",
                 "libselinux",
             ],
+
+            export_static_lib_headers: [
+                "libfstab",
+            ],
         },
     },
 }