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

Commit f42d0283 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Add vendor_available to liblog_headers."

parents 0c22c564 c30f248c
Loading
Loading
Loading
Loading
+21 −2
Original line number Original line Diff line number Diff line
@@ -42,6 +42,24 @@ liblog_target_sources = [
    "logd_writer.c",
    "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
// Shared and static library for host and device
// ========================================================
// ========================================================
cc_library {
cc_library {
@@ -81,7 +99,8 @@ cc_library {
        },
        },
    },
    },


    export_include_dirs: ["include"],
    header_libs: ["liblog_headers"],
    export_header_lib_headers: ["liblog_headers"],


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


ndk_headers {
ndk_headers {
    name: "liblog_headers",
    name: "liblog_ndk_headers",
    from: "include/android",
    from: "include/android",
    to: "android",
    to: "android",
    srcs: ["include/android/log.h"],
    srcs: ["include/android/log.h"],
+2 −3
Original line number Original line Diff line number Diff line
@@ -18,10 +18,12 @@ cc_library_headers {
    host_supported: true,
    host_supported: true,


    header_libs: [
    header_libs: [
        "liblog_headers",
        "libsystem_headers",
        "libsystem_headers",
        "libcutils_headers"
        "libcutils_headers"
    ],
    ],
    export_header_lib_headers: [
    export_header_lib_headers: [
        "liblog_headers",
        "libsystem_headers",
        "libsystem_headers",
        "libcutils_headers"
        "libcutils_headers"
    ],
    ],
@@ -79,9 +81,6 @@ cc_library {
    shared_libs: [
    shared_libs: [
        "liblog",
        "liblog",
    ],
    ],
    export_shared_lib_headers: [
        "liblog",
    ],


    arch: {
    arch: {
        mips: {
        mips: {