aboutsummaryrefslogtreecommitdiffstats
path: root/Android.mk
diff options
context:
space:
mode:
authorDmitry Shmidt <dimitrysh@google.com>2013-11-22 18:37:07 (GMT)
committerJouni Malinen <j@w1.fi>2013-11-22 18:42:00 (GMT)
commit3c2e82f101c9adf4eaf3634c223c64fb516c2927 (patch)
tree9dbf722bf22140c8a334e3ae427187c9a516788d /Android.mk
parenta94737ea38a44ba7c8d4e48dd824c67a5b70bee3 (diff)
downloadhostap-3c2e82f101c9adf4eaf3634c223c64fb516c2927.zip
hostap-3c2e82f101c9adf4eaf3634c223c64fb516c2927.tar.gz
hostap-3c2e82f101c9adf4eaf3634c223c64fb516c2927.tar.bz2
Android: wpa_supplicant: Use Ver 0.8.X as default
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk15
1 files changed, 14 insertions, 1 deletions
diff --git a/Android.mk b/Android.mk
index c2cc68b..4a74b24 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,3 +1,16 @@
+LOCAL_PATH:= $(call my-dir)
+
+ifndef WPA_SUPPLICANT_VERSION
+WPA_SUPPLICANT_VERSION := VER_0_8_X
+endif
+ifeq ($(WPA_SUPPLICANT_VERSION),VER_0_8_X)
+# 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
ifeq ($(WPA_SUPPLICANT_VERSION),VER_2_1_DEVEL)
- include $(call all-subdir-makefiles)
+include $(call all-subdir-makefiles)
endif