commit 0fb734060951ad2513680f2d9f9013ff68c2772e
author Mike J. Chen <mjchen@google.com> Thu Dec 06 18:58:14 2012 -0800
committer Android Git Automerger <android-git-automerger@android.com> Thu Dec 06 18:58:14 2012 -0800
tree f199173c6f29558140dabd270582a3ebb3ec3ecd
parent d35019220f1bbc0766a383d9502bcab956dec20c
parent 0cc49e8db007f71888bf706420edfc530cf4fbff

am 0cc49e8d: Add BOARD_WLAN_DEVICE=mrvl check for ANDROID_P2P support

* commit '0cc49e8db007f71888bf706420edfc530cf4fbff':
  Add BOARD_WLAN_DEVICE=mrvl check for ANDROID_P2P support

hostapd/Android.mk

diff --git a/hostapd/Android.mk b/hostapd/Android.mk
index ee153d0..cea6aa1 100644
--- a/hostapd/Android.mk
+++ b/hostapd/Android.mk
@@ -33,6 +33,10 @@
 L_CFLAGS += -DANDROID_P2P
 endif
 
+ifeq ($(BOARD_WLAN_DEVICE), mrvl)
+L_CFLAGS += -DANDROID_P2P
+endif
+
 # 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/hostapd\"

wpa_supplicant/Android.mk

diff --git a/wpa_supplicant/Android.mk b/wpa_supplicant/Android.mk
index 7438ba1..33e4579 100644
--- a/wpa_supplicant/Android.mk
+++ b/wpa_supplicant/Android.mk
@@ -38,6 +38,10 @@
 L_CFLAGS += -DANDROID_P2P
 endif
 
+ifeq ($(BOARD_WLAN_DEVICE), mrvl)
+L_CFLAGS += -DANDROID_P2P
+endif
+
 # 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\"