ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge changes Ia0ca36fc,Ib42c0635

Browse source 
* changes:
  Enable liblog on host bionic
  Enable libbase/libutils/libziparchive on host bionic
This commit is contained in:
Treehugger Robot 2016-11-30 05:59:52 +00:00 • committed by Gerrit Code Review
commit 1abc3cd641
5 changed files with 32 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
base/Android.bp
View file

@ -49,6 +49,11 @@ cc_library {
srcs: ["errors_unix.cpp"], srcs: ["errors_unix.cpp"],
cppflags: ["-Wexit-time-destructors"], cppflags: ["-Wexit-time-destructors"],
}, },
linux_bionic: {
srcs: ["errors_unix.cpp"],
cppflags: ["-Wexit-time-destructors"],
enabled: true,
},
linux: { linux: {
srcs: ["errors_unix.cpp"], srcs: ["errors_unix.cpp"],
cppflags: ["-Wexit-time-destructors"], cppflags: ["-Wexit-time-destructors"],

3
liblog/Android.bp
View file

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

12
liblog/logger_write.c
View file

@ -48,7 +48,7 @@ static enum {
static int check_log_uid_permissions() static int check_log_uid_permissions()
{ {
#if defined(__BIONIC__) #if defined(__ANDROID__)
uid_t uid = __android_log_uid(); uid_t uid = __android_log_uid();
/* Matches clientHasLogCredentials() in logd */ /* Matches clientHasLogCredentials() in logd */
@ -130,7 +130,7 @@ LIBLOG_ABI_PUBLIC int __android_log_dev_available()
return kLogNotAvailable; return kLogNotAvailable;
} }
#if defined(__BIONIC__) #if defined(__ANDROID__)
static atomic_uintptr_t tagMap; static atomic_uintptr_t tagMap;
#endif #endif
@ -140,7 +140,7 @@ static atomic_uintptr_t tagMap;
LIBLOG_ABI_PUBLIC void __android_log_close() LIBLOG_ABI_PUBLIC void __android_log_close()
{ {
struct android_log_transport_write *transport; struct android_log_transport_write *transport;
#if defined(__BIONIC__) #if defined(__ANDROID__)
EventTagMap *m; EventTagMap *m;
#endif #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 * Additional risk here somewhat mitigated by immediately unlock flushing
* the processor cache. The multi-threaded race that we choose to accept, * 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(); __android_log_unlock();
#if defined(__BIONIC__) #if defined(__ANDROID__)
if (m != (EventTagMap *)(uintptr_t)-1LL) android_closeEventTagMap(m); if (m != (EventTagMap *)(uintptr_t)-1LL) android_closeEventTagMap(m);
#endif #endif
@ -261,7 +261,7 @@ static int __write_to_log_daemon(log_id_t log_id, struct iovec *vec, size_t nr)
return -EINVAL; return -EINVAL;
} }
#if defined(__BIONIC__) #if defined(__ANDROID__)
if (log_id == LOG_ID_SECURITY) { if (log_id == LOG_ID_SECURITY) {
if (vec[0].iov_len < 4) { if (vec[0].iov_len < 4) {
return -EINVAL; return -EINVAL;

7
libutils/Android.bp
View file

@ -86,6 +86,13 @@ cc_library {
"ProcessCallStack.cpp", "ProcessCallStack.cpp",
], ],
}, },
linux_bionic: {
enabled: true,
srcs: [
"Looper.cpp",
"ProcessCallStack.cpp",
],
},
darwin: { darwin: {
cflags: ["-Wno-unused-parameter"], cflags: ["-Wno-unused-parameter"],

12
libziparchive/Android.bp
View file

@ -62,7 +62,17 @@ cc_library {
android: { android: {
static_libs: ["libz"], 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"], shared_libs: ["libz-host"],
}, },
}, },