From: Ying Wang <wangying@google.com>
Date: Mon, 25 Nov 2013 18:45:06 +0000 (-0800)
Subject: Treat VER_2_1_DEVEL the same as VER_0_8_X
X-Git-Tag: hostap_2_1~455
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8fcabc681760a390dc9ce16de57162e52e39058b;p=thirdparty%2Fhostap.git

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>
---

diff --git a/Android.mk b/Android.mk
index 0e8cb6c18..bd7a40974 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