Browse Source

Set ANDROID_LOG_NAME depending on application

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Dmitry Shmidt 13 years ago
parent
commit
8f5b9aa19a
3 changed files with 11 additions and 1 deletions
  1. 3 0
      hostapd/Android.mk
  2. 5 1
      src/utils/wpa_debug.c
  3. 3 0
      wpa_supplicant/Android.mk

+ 3 - 0
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

+ 5 - 1
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);
 	}
 }

+ 3 - 0
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\"