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
This commit is contained in:
parent
bb8f0fff17
commit
cecad743c1
4 changed files with 4 additions and 5 deletions
|
@ -75,7 +75,6 @@ cc_defaults {
|
||||||
|
|
||||||
// external dependencies
|
// external dependencies
|
||||||
"libhealthhalutils",
|
"libhealthhalutils",
|
||||||
"libfstab",
|
|
||||||
],
|
],
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -153,7 +152,6 @@ cc_binary {
|
||||||
|
|
||||||
static_libs: [
|
static_libs: [
|
||||||
"libotautil",
|
"libotautil",
|
||||||
"libfstab",
|
|
||||||
],
|
],
|
||||||
|
|
||||||
init_rc: [
|
init_rc: [
|
||||||
|
@ -181,7 +179,6 @@ cc_binary {
|
||||||
|
|
||||||
static_libs: [
|
static_libs: [
|
||||||
"libotautil",
|
"libotautil",
|
||||||
"libfstab",
|
|
||||||
],
|
],
|
||||||
|
|
||||||
init_rc: [
|
init_rc: [
|
||||||
|
|
|
@ -34,7 +34,6 @@
|
||||||
#include <android-base/logging.h>
|
#include <android-base/logging.h>
|
||||||
#include <android-base/properties.h>
|
#include <android-base/properties.h>
|
||||||
#include <android-base/unique_fd.h>
|
#include <android-base/unique_fd.h>
|
||||||
#include <fstab/fstab.h>
|
|
||||||
|
|
||||||
#include "otautil/roots.h"
|
#include "otautil/roots.h"
|
||||||
|
|
||||||
|
|
|
@ -43,7 +43,6 @@ cc_defaults {
|
||||||
// external dependencies
|
// external dependencies
|
||||||
"libvintf_recovery",
|
"libvintf_recovery",
|
||||||
"libvintf",
|
"libvintf",
|
||||||
"libfstab",
|
|
||||||
],
|
],
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -61,6 +61,10 @@ cc_library_static {
|
||||||
"libfs_mgr",
|
"libfs_mgr",
|
||||||
"libselinux",
|
"libselinux",
|
||||||
],
|
],
|
||||||
|
|
||||||
|
export_static_lib_headers: [
|
||||||
|
"libfstab",
|
||||||
|
],
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue