Set ANDROID_LOG_NAME depending on application

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

diff --git a/hostapd/Android.mk b/hostapd/Android.mk
index aa9d5ba..2b53f03 100644 (file)
--- 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 (file)
--- 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 (file)
--- 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\"