commit 45fcd5c547a5010a04871a463e54554f1cf693ef
author Kenny Root <kroot@android.com> Tue Jan 29 22:56:42 2013 -0800
committer Android Git Automerger <android-git-automerger@android.com> Tue Jan 29 22:56:42 2013 -0800
tree c86c60a08d48971b7e9b4c35d38b96dcf5b3e526
parent cd4bf967a77b0bc5e84fd40a2cd418e2551f3f7a
parent f137c56d1c0820255d826a8ffa9b7d8c7cbcabed

am f137c56d: Merge "Fix INCLUDES path for keystore headers."

# By Stephen Smalley
# Via Gerrit Code Review (1) and Stephen Smalley (1)
* commit 'f137c56d1c0820255d826a8ffa9b7d8c7cbcabed':
  Fix INCLUDES path for keystore headers.

hostapd/Android.mk

diff --git a/hostapd/Android.mk b/hostapd/Android.mk
index 865c43d..4571002 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\"