diff options
| author | Tao Bao <tbao@google.com> | 2019-04-04 09:38:46 +0200 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-04-04 09:38:46 +0200 |
| commit | 98b49695d1a8315580b7d83a022524df15d25e3b (patch) | |
| tree | f1c2e6fc0854b2e4e5c39cc5986c8b31a084cddb | |
| parent | Merge master@5428150 into git_qt-dev-plus-aosp. (diff) | |
| parent | Merge "libotautil exports libfstab header." (diff) | |
| download | android_bootable_recovery-98b49695d1a8315580b7d83a022524df15d25e3b.tar android_bootable_recovery-98b49695d1a8315580b7d83a022524df15d25e3b.tar.gz android_bootable_recovery-98b49695d1a8315580b7d83a022524df15d25e3b.tar.bz2 android_bootable_recovery-98b49695d1a8315580b7d83a022524df15d25e3b.tar.lz android_bootable_recovery-98b49695d1a8315580b7d83a022524df15d25e3b.tar.xz android_bootable_recovery-98b49695d1a8315580b7d83a022524df15d25e3b.tar.zst android_bootable_recovery-98b49695d1a8315580b7d83a022524df15d25e3b.zip | |
| -rw-r--r-- | Android.bp | 3 | ||||
| -rw-r--r-- | fsck_unshare_blocks.cpp | 1 | ||||
| -rw-r--r-- | install/Android.bp | 1 | ||||
| -rw-r--r-- | 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", + ], }, }, } |