From a1407217b1ca7eb3c401c22f01e6ddac0e067435 Mon Sep 17 00:00:00 2001 From: Kevin Cernekee Date: Fri, 19 Jun 2015 17:22:29 -0700 Subject: [PATCH] Android: Rename ANDROID_P2P_STUB to ANDROID_LIB_STUB 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 Signed-off-by: Kevin Cernekee --- hostapd/Android.mk | 3 ++- src/drivers/driver_nl80211_android.c | 4 ++-- wpa_supplicant/Android.mk | 3 ++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/hostapd/Android.mk b/hostapd/Android.mk index 9dde32f83..57158d831 100644 --- a/hostapd/Android.mk +++ b/hostapd/Android.mk @@ -29,8 +29,9 @@ L_CFLAGS += -Wno-unused-parameter # Set Android extended P2P functionality L_CFLAGS += -DANDROID_P2P + ifeq ($(BOARD_HOSTAPD_PRIVATE_LIB),) -L_CFLAGS += -DANDROID_P2P_STUB +L_CFLAGS += -DANDROID_LIB_STUB endif # Use Android specific directory for control interface sockets diff --git a/src/drivers/driver_nl80211_android.c b/src/drivers/driver_nl80211_android.c index f3a39f660..ba4788884 100644 --- a/src/drivers/driver_nl80211_android.c +++ b/src/drivers/driver_nl80211_android.c @@ -151,7 +151,7 @@ int android_pno_stop(struct i802_bss *bss) #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) { @@ -178,7 +178,7 @@ int wpa_driver_set_ap_wps_p2p_ie(void *priv, const struct wpabuf *beacon, return 0; } -#endif /* ANDROID_P2P_STUB */ +#endif /* ANDROID_LIB_STUB */ #endif /* ANDROID_P2P */ diff --git a/wpa_supplicant/Android.mk b/wpa_supplicant/Android.mk index 657784b63..84a0d58dc 100644 --- a/wpa_supplicant/Android.mk +++ b/wpa_supplicant/Android.mk @@ -27,8 +27,9 @@ L_CFLAGS += -Wno-unused-parameter # Set Android extended P2P functionality L_CFLAGS += -DANDROID_P2P + ifeq ($(BOARD_WPA_SUPPLICANT_PRIVATE_LIB),) -L_CFLAGS += -DANDROID_P2P_STUB +L_CFLAGS += -DANDROID_LIB_STUB endif # Disable roaming in wpa_supplicant