diff options
author | Dmitry Shmidt <dimitrysh@google.com> | 2011-10-21 17:26:35 +0300 |
---|---|---|
committer | Jouni Malinen <j@w1.fi> | 2011-10-21 18:59:42 +0300 |
commit | 8f5b9aa19a010b5cb2d10b5ddc19eba830492692 (patch) | |
tree | 2235ad1be7bb34d764e4499bc5a69d964e855d39 | |
parent | 9aa10e2b2784eb658392994798ded5277543dd0a (diff) | |
download | external_wpa_supplicant_8_ti-8f5b9aa19a010b5cb2d10b5ddc19eba830492692.zip external_wpa_supplicant_8_ti-8f5b9aa19a010b5cb2d10b5ddc19eba830492692.tar.gz external_wpa_supplicant_8_ti-8f5b9aa19a010b5cb2d10b5ddc19eba830492692.tar.bz2 |
Set ANDROID_LOG_NAME depending on application
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
-rw-r--r-- | hostapd/Android.mk | 3 | ||||
-rw-r--r-- | src/utils/wpa_debug.c | 6 | ||||
-rw-r--r-- | wpa_supplicant/Android.mk | 3 |
3 files changed, 11 insertions, 1 deletions
diff --git a/hostapd/Android.mk b/hostapd/Android.mk index aa9d5ba..2b53f03 100644 --- a/hostapd/Android.mk +++ b/hostapd/Android.mk @@ -13,6 +13,9 @@ include $(LOCAL_PATH)/.config # To ignore possible wrong network configurations L_CFLAGS = -DWPA_IGNORE_CONFIG_ERRORS +# Set Android log name +L_CFLAGS += -DANDROID_LOG_NAME=\"hostapd\" + # To force sizeof(enum) = 4 ifeq ($(TARGET_ARCH),arm) L_CFLAGS += -mabi=aapcs-linux diff --git a/src/utils/wpa_debug.c b/src/utils/wpa_debug.c index b8c5e2f..5b56d83 100644 --- a/src/utils/wpa_debug.c +++ b/src/utils/wpa_debug.c @@ -32,6 +32,10 @@ int wpa_debug_timestamp = 0; #include <android/log.h> +#ifndef ANDROID_LOG_NAME +#define ANDROID_LOG_NAME "wpa_supplicant" +#endif /* ANDROID_LOG_NAME */ + void android_printf(int level, char *format, ...) { if (level >= wpa_debug_level) { @@ -45,7 +49,7 @@ void android_printf(int level, char *format, ...) else level = ANDROID_LOG_DEBUG; va_start(ap, format); - __android_log_vprint(level, "wpa_supplicant", format, ap); + __android_log_vprint(level, ANDROID_LOG_NAME, format, ap); va_end(ap); } } diff --git a/wpa_supplicant/Android.mk b/wpa_supplicant/Android.mk index 79a2146..5fe1abd 100644 --- a/wpa_supplicant/Android.mk +++ b/wpa_supplicant/Android.mk @@ -31,6 +31,9 @@ include $(LOCAL_PATH)/.config # To ignore possible wrong network configurations L_CFLAGS = -DWPA_IGNORE_CONFIG_ERRORS +# Set Android log name +L_CFLAGS += -DANDROID_LOG_NAME=\"wpa_supplicant\" + # Use Android specific directory for control interface sockets L_CFLAGS += -DCONFIG_CTRL_IFACE_CLIENT_DIR=\"/data/misc/wifi/sockets\" L_CFLAGS += -DCONFIG_CTRL_IFACE_DIR=\"/data/system/wpa_supplicant\" |