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

Commit c30f248c authored by Steven Moreland's avatar Steven Moreland
Browse files

Add vendor_available to liblog_headers. 

Renamed NDK headers to "liblog_ndk_headers"
(these names aren't used anywhere).

libutils_headers now properly export liblog_headers.

Test: with BOARD_VNDK_VERSION=current
Merged-In: I3a85385f588b84393c57fd6d1bcac620f708f0f1
Change-Id: I3a85385f588b84393c57fd6d1bcac620f708f0f1
parent 0c22c564

liblog/Android.bp

+21 −2
Original line number Diff line number Diff line
@@ -42,6 +42,24 @@ liblog_target_sources = [ 
    "logd_writer.c",

]



cc_library_headers {

    name: "liblog_headers",

    host_supported: true,

    vendor_available: true,

    export_include_dirs: ["include"],

    target: {

        windows: {

            enabled: true,

        },

        linux_bionic: {

            enabled: true,

        },

        vendor: {

            export_include_dirs: ["include_vndk"],

        },

    },

}



// Shared and static library for host and device

// ========================================================

cc_library {
@@ -81,7 +99,8 @@ cc_library { 
        },

    },



    export_include_dirs: ["include"],

    header_libs: ["liblog_headers"],

    export_header_lib_headers: ["liblog_headers"],



    cflags: [

        "-Werror",
@@ -100,7 +119,7 @@ cc_library { 
}



ndk_headers {

    name: "liblog_headers",

    name: "liblog_ndk_headers",

    from: "include/android",

    to: "android",

    srcs: ["include/android/log.h"],

libutils/Android.bp

+2 −3
Original line number Diff line number Diff line
@@ -18,10 +18,12 @@ cc_library_headers { 
    host_supported: true,



    header_libs: [

        "liblog_headers",

        "libsystem_headers",

        "libcutils_headers"

    ],

    export_header_lib_headers: [

        "liblog_headers",

        "libsystem_headers",

        "libcutils_headers"

    ],
@@ -79,9 +81,6 @@ cc_library { 
    shared_libs: [

        "liblog",

    ],

    export_shared_lib_headers: [

        "liblog",

    ],



    arch: {

        mips: {