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

MingW doesn't handle __attribute__((weak)) for Windows PE

Browse source 
Windows PE format doesn't have the same support for weak symbols
as ELF does.

The symbol android_log_id_to_name was strangely omitted from the
resulting Windows executable and the callsite where it was supposed
to be called was relaced with a different symbol, which caused a crash
in AAPT on Windows.

This change works due to a careful set of #ifdefs that ensure only one
definition of android_log_id_to_name is defined, but there are other
uses of __attribute__((weak)) which should be inspected.

Change-Id: I3b58076e31d9b28c5143773a170e9ffda9fa3815
This commit is contained in:
Adam Lesinski 2014-10-20 12:31:30 -07:00
parent 1c77bf4ce5
commit a1ac84cd8d
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
liblog/logd_write.c
View file

@ -58,7 +58,6 @@ static pthread_mutex_t log_init_lock = PTHREAD_MUTEX_INITIALIZER;
#endif #endif
#if FAKE_LOG_DEVICE #if FAKE_LOG_DEVICE
#define WEAK __attribute__((weak))
static int log_fds[(int)LOG_ID_MAX] = { -1, -1, -1, -1, -1 }; static int log_fds[(int)LOG_ID_MAX] = { -1, -1, -1, -1, -1 };
#else #else
static int logd_fd = -1; static int logd_fd = -1;
@ -274,7 +273,7 @@ static const char *LOG_NAME[LOG_ID_MAX] = {
[LOG_ID_CRASH] = "crash" [LOG_ID_CRASH] = "crash"
}; };
const WEAK char *android_log_id_to_name(log_id_t log_id) const char *android_log_id_to_name(log_id_t log_id)
{ {
if (log_id >= LOG_ID_MAX) { if (log_id >= LOG_ID_MAX) {
log_id = LOG_ID_MAIN; log_id = LOG_ID_MAIN;