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

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

Merge changes from topic 'system-vendor-internal-pick' 

* changes:
  libbase: fix build breakage
  libsync: vendor_available
  Remove VNDK warning.
  libbase: make vendor_available
  libcutils: vendor_available
  libbacktrace: make vendor_available
  libbase: add libbase_headers
parents 8dead17a e131f31d

base/Android.bp

+24 −2
Original line number Diff line number Diff line
@@ -20,8 +20,28 @@ libbase_cppflags = [ 
    "-Werror",

]



cc_library_headers {

    name: "libbase_headers",

    vendor_available: true,

    host_supported: true,

    export_include_dirs: ["include"],



    header_libs: ["libutils_headers"],

    export_header_lib_headers: ["libutils_headers"],



    target: {

        linux_bionic: {

            enabled: true,

        },

        windows: {

            enabled: true,

        },

    },

}



cc_library {

    name: "libbase",

    vendor_available: true,

    clang: true,

    host_supported: true,

    srcs: [
@@ -33,9 +53,11 @@ cc_library { 
        "strings.cpp",

        "test_utils.cpp",

    ],

    local_include_dirs: ["include"],



    header_libs: ["libbase_headers"],

    export_header_lib_headers: ["libbase_headers"],



    cppflags: libbase_cppflags,

    export_include_dirs: ["include"],

    shared_libs: ["liblog"],

    target: {

        android: {

libbacktrace/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -62,6 +62,7 @@ cc_library_headers { 


cc_library {

    name: "libbacktrace",

    vendor_available: true,

    defaults: ["libbacktrace_common"],

    host_supported: true,

libcutils/Android.bp

+5 −6
Original line number Diff line number Diff line
@@ -29,17 +29,15 @@ libcutils_nonwindows_sources = [ 
    "str_parms.c",

]



cc_library_headers {

    name: "libcutils_vndk_headers",

    host_supported: true,

    export_include_dirs: ["include_vndk"],

}



cc_library_headers {

    name: "libcutils_headers",

    vendor_available: true,

    host_supported: true,

    export_include_dirs: ["include"],

    target: {

        vendor: {

            export_include_dirs: ["include_vndk"],

        },

        linux_bionic: {

            enabled: true,

        },
@@ -51,6 +49,7 @@ cc_library_headers { 


cc_library {

    name: "libcutils",

    vendor_available: true,

    host_supported: true,

    srcs: [

        "config_utils.c",

libcutils/include_vndk/cutils/log.h

+27 −1
Original line number Diff line number Diff line
@@ -16,6 +16,32 @@ 
*/

#ifndef _LIBS_CUTIL_LOG_H

#define _LIBS_CUTIL_LOG_H

#warning "Deprecated: don't include cutils/log.h, use either android/log.h or log/log.h"



/* We do not know if developer wanted log/log.h or subset android/log.h */

#include <log/log.h>



#if defined(__GNUC__)

#if defined( __clang__)

#pragma GCC diagnostic push

#pragma GCC diagnostic warning "-W#warnings"

#pragma clang diagnostic push

#pragma clang diagnostic ignored "-Wpedantic"

#elif (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR > 9))

#pragma GCC diagnostic push

#pragma GCC diagnostic warning "-W#warnings"

#else

#pragma GCC diagnostic push

#pragma GCC diagnostic warning "-Wcpp"

#endif

#endif



#warning "Deprecated: don't include cutils/log.h, use either android/log.h or log/log.h"



#if defined(__GNUC__)

#if defined( __clang__)

#pragma clang diagnostic pop

#endif

#pragma GCC diagnostic pop

#endif



#endif /* _LIBS_CUTIL_LOG_H */

libsync/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ cc_defaults { 


cc_library_shared {

    name: "libsync",

    vendor_available: true,

    defaults: ["libsync_defaults"],

}