pa-fazil
/
android_system_core
mirror of https://github.com/fazilsheik96/android_system_core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Dan Willemsen 2016-11-29 13:39:55 -08:00
parent ab34b47b35
commit 0910d2dbb9
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
liblog/Android.bp
View File

@ -73,6 +73,9 @@ cc_library {
linux: {
host_ldlibs: ["-lrt"],
},
linux_bionic: {
enabled: true,
},
},
cflags: [

12
liblog/logger_write.c
View File

@ -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;