Merge "Use libcutils_headers for android_filesystem_config.h" am: 67e08784ed am: ec0ffbcff3 am: a330604594 am: f5dad71dfa

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1430209

Change-Id: Ia182e21a676f135b4fe088c2fc3a5f2b339ce64d
This commit is contained in:
Tom Cherry 2020-09-21 17:08:28 +00:00 committed by Automerger Merge Worker
commit e47405bcd8
5 changed files with 8 additions and 1 deletions

View file

@ -28,6 +28,7 @@ cc_library_headers {
name: "libcutils_headers", name: "libcutils_headers",
vendor_available: true, vendor_available: true,
recovery_available: true, recovery_available: true,
ramdisk_available: true,
host_supported: true, host_supported: true,
apex_available: [ apex_available: [
"//apex_available:platform", "//apex_available:platform",

View file

@ -98,6 +98,7 @@ cc_library {
header_libs: [ header_libs: [
"libbase_headers", "libbase_headers",
"libcutils_headers",
"liblog_headers", "liblog_headers",
], ],
export_header_lib_headers: ["liblog_headers"], export_header_lib_headers: ["liblog_headers"],

View file

@ -32,7 +32,10 @@ cc_defaults {
"-DWRITE_TO_STATSD=1", "-DWRITE_TO_STATSD=1",
"-DWRITE_TO_LOGD=0", "-DWRITE_TO_LOGD=0",
], ],
header_libs: ["libstatssocket_headers"], header_libs: [
"libcutils_headers",
"libstatssocket_headers",
],
static_libs: [ static_libs: [
"libbase", "libbase",
], ],

View file

@ -36,6 +36,7 @@ cc_defaults {
"libz", "libz",
], ],
static_libs: ["libzstd"], static_libs: ["libzstd"],
header_libs: ["libcutils_headers"],
cflags: [ cflags: [
"-Wextra", "-Wextra",
"-Wthread-safety", "-Wthread-safety",

View file

@ -25,4 +25,5 @@ cc_binary {
"libpackagelistparser", "libpackagelistparser",
"libminijail", "libminijail",
], ],
header_libs: ["libcutils_headers"],
} }