Message ID | 1434759750-17647-1-git-send-email-cernekee@chromium.org |
---|---|
State | Accepted |
Headers | show |
On Fri, Jun 19, 2015 at 05:22:29PM -0700, Kevin Cernekee wrote: > 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. Thanks, both patches applied.
diff --git a/hostapd/Android.mk b/hostapd/Android.mk index 78a150634fa7..8556f88f6aff 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 3cc9a65867f6..6745ca5b5b8c 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 657784b63a65..84a0d58dcbb9 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