diff options
| author | Dmitry Shmidt <dimitrysh@google.com> | 2011-09-30 15:03:42 -0700 |
|---|---|---|
| committer | Dmitry Shmidt <dimitrysh@google.com> | 2011-09-30 15:03:42 -0700 |
| commit | 648b7492d15bb4efaeebdfdd8bd261563a5f6227 (patch) | |
| tree | cbe7ae4b5610752471d6d5c9477635dc3d409f71 | |
| parent | b98d1c2746bf93497d587d12b2657cb9b8c5c76c (diff) | |
| download | wpa_supplicant_8-ics-mr0-release.tar.gz | |
Set ANDROID_LOG_NAME depending on applicationandroid-sdk-adt_r16.0.1android-sdk-4.0.3_r1android-sdk-4.0.3-tools_r1android-cts-verifier-4.0_r1android-cts-verifier-4.0.3_r1android-cts-4.0_r1android-cts-4.0.3_r2android-cts-4.0.3_r1android-4.0.4_r2.1android-4.0.4_r2android-4.0.4_r1.2android-4.0.4_r1.1android-4.0.4_r1android-4.0.3_r1.1android-4.0.3_r1android-4.0.2_r1android-4.0.1_r1.2android-4.0.1_r1.1android-4.0.1_r1ics-mr1-releaseics-mr1ics-mr0-releaseics-mr0ics-factoryrom-2-release
Change-Id: I8ef6f87c92b01a089817a4902d33bf5d0c3a5a7a
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 4655cfd8..403375f0 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\" + ifdef CONFIG_DRIVER_NL80211 L_CFLAGS += -DANDROID_BRCM_P2P_PATCH endif diff --git a/src/utils/wpa_debug.c b/src/utils/wpa_debug.c index b8c5e2fe..0588fc6f 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 + 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 9d4b9970..3d65cc60 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\" + ifdef CONFIG_DRIVER_NL80211 L_CFLAGS += -DANDROID_BRCM_P2P_PATCH endif |