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

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

Merge changes from topic "fix-omx-dependencies" 

* changes:
  Add vendor_available to liblog_headers.
  Add sys/cdefs.h to log/log_main.h.
parents ff9c7c5e 25db8dc2

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"],

liblog/include/log/log_main.h

+3 −6
Original line number Diff line number Diff line
@@ -18,10 +18,9 @@ 
#define _LIBS_LOG_LOG_MAIN_H



#include <android/log.h>

#include <sys/cdefs.h>



#ifdef __cplusplus

extern "C" {

#endif

__BEGIN_DECLS



/*

 * Normally we strip the effects of ALOGV (VERBOSE messages),
@@ -385,8 +384,6 @@ int __android_log_is_loggable_len(int prio, const char* tag, size_t len, 
#pragma clang diagnostic pop

#endif



#ifdef __cplusplus

}

#endif

__END_DECLS



#endif /* _LIBS_LOG_LOG_MAIN_H */

libutils/Android.bp

+2 −0
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"

    ],