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

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

Merge changes Ia0ca36fc,Ib42c0635 

* changes:
  Enable liblog on host bionic
  Enable libbase/libutils/libziparchive on host bionic
parents 94b9e4df 0910d2db

base/Android.bp

+5 −0
Original line number Diff line number Diff line
@@ -49,6 +49,11 @@ cc_library { 
            srcs: ["errors_unix.cpp"],

            cppflags: ["-Wexit-time-destructors"],

        },

        linux_bionic: {

            srcs: ["errors_unix.cpp"],

            cppflags: ["-Wexit-time-destructors"],

            enabled: true,

        },

        linux: {

            srcs: ["errors_unix.cpp"],

            cppflags: ["-Wexit-time-destructors"],

liblog/Android.bp

+3 −0
Original line number Diff line number Diff line
@@ -73,6 +73,9 @@ cc_library { 
        linux: {

            host_ldlibs: ["-lrt"],

        },

        linux_bionic: {

            enabled: true,

        },

    },



    cflags: [

liblog/logger_write.c

+6 −6
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ static enum { 


static int check_log_uid_permissions()

{

#if defined(__BIONIC__)

#if defined(__ANDROID__)

    uid_t uid = __android_log_uid();



    /* Matches clientHasLogCredentials() in logd */
@@ -130,7 +130,7 @@ LIBLOG_ABI_PUBLIC int __android_log_dev_available() 
    return kLogNotAvailable;

}



#if defined(__BIONIC__)

#if defined(__ANDROID__)

static atomic_uintptr_t tagMap;

#endif
@@ -140,7 +140,7 @@ static atomic_uintptr_t tagMap; 
LIBLOG_ABI_PUBLIC void __android_log_close()

{

    struct android_log_transport_write *transport;

#if defined(__BIONIC__)

#if defined(__ANDROID__)

    EventTagMap *m;

#endif
@@ -170,7 +170,7 @@ LIBLOG_ABI_PUBLIC void __android_log_close() 
        }

    }



#if defined(__BIONIC__)

#if defined(__ANDROID__)

    /*

     * Additional risk here somewhat mitigated by immediately unlock flushing

     * the processor cache. The multi-threaded race that we choose to accept,
@@ -188,7 +188,7 @@ LIBLOG_ABI_PUBLIC void __android_log_close() 


    __android_log_unlock();



#if defined(__BIONIC__)

#if defined(__ANDROID__)

    if (m != (EventTagMap *)(uintptr_t)-1LL) android_closeEventTagMap(m);

#endif
@@ -261,7 +261,7 @@ static int __write_to_log_daemon(log_id_t log_id, struct iovec *vec, size_t nr) 
        return -EINVAL;

    }



#if defined(__BIONIC__)

#if defined(__ANDROID__)

    if (log_id == LOG_ID_SECURITY) {

        if (vec[0].iov_len < 4) {

            return -EINVAL;

libutils/Android.bp

+7 −0
Original line number Diff line number Diff line
@@ -86,6 +86,13 @@ cc_library { 
                "ProcessCallStack.cpp",

            ],

        },

        linux_bionic: {

            enabled: true,

            srcs: [

                "Looper.cpp",

                "ProcessCallStack.cpp",

            ],

        },



        darwin: {

            cflags: ["-Wno-unused-parameter"],

libziparchive/Android.bp

+11 −1
Original line number Diff line number Diff line
@@ -62,7 +62,17 @@ cc_library { 
        android: {

            static_libs: ["libz"],

        },

        host: {

        linux_bionic: {

            static_libs: ["libz"],

            enabled: true,

        },

        linux: {

            shared_libs: ["libz-host"],

        },

        darwin: {

            shared_libs: ["libz-host"],

        },

        windows: {

            shared_libs: ["libz-host"],

        },

    },