DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Android: Rename ANDROID_P2P_STUB to ANDROID_LIB_STUB

Browse source 
If BOARD_HOSTAPD_PRIVATE_LIB is not used on an Android build, we will
need to replace both the p2p functions *and* wpa_driver_nl80211_driver_cmd
in order to successfully link.  Let's make the name more generic so it is
more obvious what it is used for.

Suggested-by: Dmitry Shmidt <dimitrysh@google.com>
Signed-off-by: Kevin Cernekee <cernekee@google.com>
This commit is contained in:
Kevin Cernekee 2015-06-19 17:22:29 -07:00 • committed by Jouni Malinen
parent 2ba4de37cb
commit a1407217b1
3 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
hostapd/Android.mk
View file

@ -29,8 +29,9 @@ L_CFLAGS += -Wno-unused-parameter
# Set Android extended P2P functionality # Set Android extended P2P functionality
L_CFLAGS += -DANDROID_P2P L_CFLAGS += -DANDROID_P2P
ifeq ($(BOARD_HOSTAPD_PRIVATE_LIB),) ifeq ($(BOARD_HOSTAPD_PRIVATE_LIB),)
L_CFLAGS += -DANDROID_P2P_STUB L_CFLAGS += -DANDROID_LIB_STUB
endif endif
# Use Android specific directory for control interface sockets # Use Android specific directory for control interface sockets

4
src/drivers/driver_nl80211_android.c
View file

@ -151,7 +151,7 @@ int android_pno_stop(struct i802_bss *bss)
#ifdef ANDROID_P2P #ifdef ANDROID_P2P
#ifdef ANDROID_P2P_STUB #ifdef ANDROID_LIB_STUB
int wpa_driver_set_p2p_noa(void *priv, u8 count, int start, int duration) int wpa_driver_set_p2p_noa(void *priv, u8 count, int start, int duration)
{ {
@ -178,7 +178,7 @@ int wpa_driver_set_ap_wps_p2p_ie(void *priv, const struct wpabuf *beacon,
return 0; return 0;
} }
#endif /* ANDROID_P2P_STUB */ #endif /* ANDROID_LIB_STUB */
#endif /* ANDROID_P2P */ #endif /* ANDROID_P2P */

3
wpa_supplicant/Android.mk
View file

@ -27,8 +27,9 @@ L_CFLAGS += -Wno-unused-parameter
# Set Android extended P2P functionality # Set Android extended P2P functionality
L_CFLAGS += -DANDROID_P2P L_CFLAGS += -DANDROID_P2P
ifeq ($(BOARD_WPA_SUPPLICANT_PRIVATE_LIB),) ifeq ($(BOARD_WPA_SUPPLICANT_PRIVATE_LIB),)
L_CFLAGS += -DANDROID_P2P_STUB L_CFLAGS += -DANDROID_LIB_STUB
endif endif
# Disable roaming in wpa_supplicant # Disable roaming in wpa_supplicant