diff options
| author | Vishal Mahaveer <vishalm@ti.com> | 2012-06-12 15:49:15 -0500 |
|---|---|---|
| committer | Vishal Mahaveer <vishalm@ti.com> | 2012-06-12 15:49:15 -0500 |
| commit | 7f4f122d0e61559e91506cfac82eba16e0ea48ee (patch) | |
| tree | 1048aeda0d46d062f38b9a8c33334a0df2e10b15 | |
| parent | 66477eee3c0005af66ddaf5f0a3f1bdceb4e1f74 (diff) | |
| download | android_hardware_ti_wlan-7f4f122d0e61559e91506cfac82eba16e0ea48ee.tar.gz android_hardware_ti_wlan-7f4f122d0e61559e91506cfac82eba16e0ea48ee.tar.bz2 android_hardware_ti_wlan-7f4f122d0e61559e91506cfac82eba16e0ea48ee.zip | |
WLAN - mac80211: build cleanup
- Remove non-existent shared library
- Include .config file according to the right name in wpa_supplicant
(Some use .config and some use android.config)
- Remove unwanted include file
Change-Id: Ic45288121b9c26473e85b133f6ed677904a0bda5
Signed-off-by: Vishal Mahaveer <vishalm@ti.com>
| -rw-r--r-- | mac80211/wpa_supplicant_lib/Android.mk | 9 | ||||
| -rw-r--r-- | mac80211/wpa_supplicant_lib/driver_mac80211_nl.c | 1 |
2 files changed, 7 insertions, 3 deletions
diff --git a/mac80211/wpa_supplicant_lib/Android.mk b/mac80211/wpa_supplicant_lib/Android.mk index 541d8bdc..7fd448e5 100644 --- a/mac80211/wpa_supplicant_lib/Android.mk +++ b/mac80211/wpa_supplicant_lib/Android.mk @@ -12,7 +12,12 @@ ifeq ($(WPA_SUPPLICANT_VERSION),VER_0_8_X) WPA_SUPPL_DIR = external/wpa_supplicant_8/wpa_supplicant endif -include $(WPA_SUPPL_DIR)/.config +ifneq ($(wildcard $(WPA_SUPPL_DIR)/.config),) + include $(WPA_SUPPL_DIR)/.config +endif +ifneq ($(wildcard $(WPA_SUPPL_DIR)/android.config),) + include $(WPA_SUPPL_DIR)/android.config +endif ifneq ($(BOARD_WPA_SUPPLICANT_DRIVER),) CONFIG_DRIVER_$(BOARD_WPA_SUPPLICANT_DRIVER) := y @@ -61,7 +66,7 @@ INCLUDES = $(WPA_SUPPL_DIR) \ include $(CLEAR_VARS) LOCAL_MODULE := lib_driver_cmd_wl12xx LOCAL_MODULE_TAGS := eng -LOCAL_SHARED_LIBRARIES := libc libcutils libnl +LOCAL_SHARED_LIBRARIES := libc libcutils LOCAL_CFLAGS := $(L_CFLAGS) LOCAL_SRC_FILES := $(L_SRC) LOCAL_C_INCLUDES := $(INCLUDES) diff --git a/mac80211/wpa_supplicant_lib/driver_mac80211_nl.c b/mac80211/wpa_supplicant_lib/driver_mac80211_nl.c index cf587e08..aa214b3c 100644 --- a/mac80211/wpa_supplicant_lib/driver_mac80211_nl.c +++ b/mac80211/wpa_supplicant_lib/driver_mac80211_nl.c @@ -30,7 +30,6 @@ #include <netlink/msg.h> #include <netlink/attr.h> -#include "wireless_copy.h" #include "common.h" #include "driver.h" #include "eloop.h" |