commit 7bf0939e106c975ac897b5d701e116b6c86ab75a
author Jean-Baptiste Queru <jbq@google.com> Mon Mar 11 13:00:55 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Mar 11 13:00:55 2013 -0700
tree aef74de8d140339b954cecdac3d4c81ef2a5c433
parent 0cc49e8db007f71888bf706420edfc530cf4fbff
parent 7298e5ab20b37767cab89e7bc5784eb99d46a749

am 7298e5ab: am 2f3c1638: (-s ours) am 89d125ec: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit '7298e5ab20b37767cab89e7bc5784eb99d46a749':

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 4f58a92..9b787d1 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\"