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

Commit 0910d2db authored by Dan Willemsen's avatar Dan Willemsen
Browse files

Enable liblog on host bionic 

Some of the __BIONIC__ checks were actually looking for an android
device. Host bionic has __BIONIC__, but not __ANDROID__.

Bug: 31559095
Test: Test linux_bionic compile
Change-Id: Ia0ca36fc9486fe8ea7e5d1b2e26ab0491903723c
parent ab34b47b

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;