X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=Android.mk;h=bd7a4097444b46a476096632536091bcd273e2af;hb=22950d0568fddd9fcd11562d5a38c8e595ab5c99;hp=0e8cb6c18ac81c7f417e0ff3b3b1104072f55448;hpb=075131e32e6967977da4bbfa8a7f63dbfbf86008;p=mech_eap.git

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