diff options
| author | Dmitry Shmidt <dimitrysh@google.com> | 2012-06-11 14:39:37 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-06-11 14:39:37 -0700 |
| commit | 768f9c8b22d9625af61f3e6a7b9a1234b7784f1a (patch) | |
| tree | ccfd6cd2df04f2b60f0bf3e167e943ed07ff77ac | |
| parent | 61dc7fcf73a67f1611a17db5b8170fb468e5137b (diff) | |
| parent | 1f42a6c19a5b3ace255b0e725dd407d10edb44af (diff) | |
| download | android_external_wpa_supplicant_8-768f9c8b22d9625af61f3e6a7b9a1234b7784f1a.tar.gz android_external_wpa_supplicant_8-768f9c8b22d9625af61f3e6a7b9a1234b7784f1a.tar.bz2 android_external_wpa_supplicant_8-768f9c8b22d9625af61f3e6a7b9a1234b7784f1a.zip | |
Merge "wpa_supplicant: Fix compilation without BOARD_WPA_SUPPLICANT_DRIVER" into jb-dev
| -rw-r--r-- | wpa_supplicant/Android.mk | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/wpa_supplicant/Android.mk b/wpa_supplicant/Android.mk index 4d11771b..c6cf80b8 100644 --- a/wpa_supplicant/Android.mk +++ b/wpa_supplicant/Android.mk @@ -8,14 +8,12 @@ LOCAL_PATH := $(call my-dir) PKG_CONFIG ?= pkg-config -WPA_BUILD_SUPPLICANT := false ifneq ($(BOARD_WPA_SUPPLICANT_DRIVER),) - WPA_BUILD_SUPPLICANT := true CONFIG_DRIVER_$(BOARD_WPA_SUPPLICANT_DRIVER) := y +else + CONFIG_DRIVER_TEST := y endif -ifeq ($(WPA_BUILD_SUPPLICANT),true) - include $(LOCAL_PATH)/android.config # To ignore possible wrong network configurations @@ -1453,8 +1451,6 @@ include $(BUILD_EXECUTABLE) # ######################## -endif # ifeq ($(WPA_BUILD_SUPPLICANT),true) - include $(CLEAR_VARS) LOCAL_MODULE = libwpa_client LOCAL_CFLAGS = $(L_CFLAGS) |