Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a5edc0fb authored by Tom Cherry's avatar Tom Cherry
Browse files

Use libcutils_headers for android_filesystem_config.h 

android_filesystem_config.h is found since system/core/include is on
the include path for all projects and contains a symlink to the real
android_filesystem_config.h.  This is fragile and the below bug seeks
to remove this symlink and have users correctly depend on
libcutils_headers.

Bug: 165825252
Test: build
Change-Id: I1aad6a2e8fbe87635e97b0ac1be3414403353382
parent 4fd78ec4

libcutils/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ cc_library_headers { 
    name: "libcutils_headers",

    vendor_available: true,

    recovery_available: true,

    ramdisk_available: true,

    host_supported: true,

    apex_available: [

        "//apex_available:platform",

liblog/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -97,6 +97,7 @@ cc_library { 


    header_libs: [

        "libbase_headers",

        "libcutils_headers",

        "liblog_headers",

    ],

    export_header_lib_headers: ["liblog_headers"],

libstats/push_compat/Android.bp

+4 −1
Original line number Diff line number Diff line
@@ -32,7 +32,10 @@ cc_defaults { 
        "-DWRITE_TO_STATSD=1",

        "-DWRITE_TO_LOGD=0",

    ],

    header_libs: ["libstatssocket_headers"],

    header_libs: [

        "libcutils_headers",

        "libstatssocket_headers",

    ],

    static_libs: [

        "libbase",

    ],

logd/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ cc_defaults { 
        "libz",

    ],

    static_libs: ["libzstd"],

    header_libs: ["libcutils_headers"],

    cflags: [

        "-Wextra",

        "-Wthread-safety",

run-as/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -25,4 +25,5 @@ cc_binary { 
        "libpackagelistparser",

        "libminijail",

    ],

    header_libs: ["libcutils_headers"],

}