aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYing Wang <wangying@google.com>2013-11-25 18:45:06 (GMT)
committerJouni Malinen <j@w1.fi>2013-12-15 05:23:39 (GMT)
commit8fcabc681760a390dc9ce16de57162e52e39058b (patch)
tree27c311d07f6f31789115646de02a46c416c52cb6
parentb154a24e8388287f19d6085c44bcf163f5e88276 (diff)
downloadhostap-8fcabc681760a390dc9ce16de57162e52e39058b.zip
hostap-8fcabc681760a390dc9ce16de57162e52e39058b.tar.gz
hostap-8fcabc681760a390dc9ce16de57162e52e39058b.tar.bz2
Treat VER_2_1_DEVEL the same as VER_0_8_X
The Android.mks to include are actually the same. Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
-rw-r--r--Android.mk5
1 files changed, 1 insertions, 4 deletions
diff --git a/Android.mk b/Android.mk
index 0e8cb6c..bd7a409 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,6 +1,6 @@
LOCAL_PATH:= $(call my-dir)
-ifeq ($(WPA_SUPPLICANT_VERSION),VER_0_8_X)
+ifneq ($(filter VER_0_8_X VER_2_1_DEVEL,$(WPA_SUPPLICANT_VERSION)),)
# The order of the 2 Android.mks does matter!
# TODO: Clean up the Android.mks, reset all the temporary variables at the
# end of each Android.mk, so that one Android.mk doesn't depend on variables
@@ -8,6 +8,3 @@ ifeq ($(WPA_SUPPLICANT_VERSION),VER_0_8_X)
include $(LOCAL_PATH)/hostapd/Android.mk \
$(LOCAL_PATH)/wpa_supplicant/Android.mk
endif
-ifeq ($(WPA_SUPPLICANT_VERSION),VER_2_1_DEVEL)
-include $(call all-subdir-makefiles)
-endif