X-Git-Url: http://www.project-moonshot.org/gitweb/?a=blobdiff_plain;f=Android.mk;h=bd7a4097444b46a476096632536091bcd273e2af;hb=a483c6f1e20c64b9659efdfccf479a60fb2c85b9;hp=c2cc68b5d466fe440a7bd46ad9db62f9384dc40d;hpb=6f1127cac6604c8032c9f3a1dac96d23f9fadb0f;p=mech_eap.git

diff --git a/Android.mk b/Android.mk
index c2cc68b..bd7a409 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,3 +1,10 @@
-ifeq ($(WPA_SUPPLICANT_VERSION),VER_2_1_DEVEL)
-    include $(call all-subdir-makefiles)
+LOCAL_PATH:= $(call my-dir)
+
+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
+# set up in the other Android.mk.
+include $(LOCAL_PATH)/hostapd/Android.mk \
+        $(LOCAL_PATH)/wpa_supplicant/Android.mk
 endif