commit 175de9376493bb3d4f4ac07dd928716277f09de5
author Irfan Sheriff <isheriff@google.com> Wed Jun 13 13:22:59 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jun 13 13:22:59 2012 -0700
tree bfd5c8cd393ddc1ad91663c0bc47f7a1a0eaf439
parent 768f9c8b22d9625af61f3e6a7b9a1234b7784f1a
parent f44b9c4a18d17fbd39901f76a014c32006570fb8

Merge "Fix p2p service discovery" into jb-dev

wpa_supplicant/Android.mk

diff --git a/wpa_supplicant/Android.mk b/wpa_supplicant/Android.mk
index 4d11771..c6cf80b 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 @@
 #
 ########################
 
-endif # ifeq ($(WPA_BUILD_SUPPLICANT),true)
-
 include $(CLEAR_VARS)
 LOCAL_MODULE = libwpa_client
 LOCAL_CFLAGS = $(L_CFLAGS)