commit 2db4db04ec38c53f9189070782f2d1be7832761e
author Ying Wang <wangying@google.com> Thu Dec 05 12:29:14 2013 -0800
committer Android Git Automerger <android-git-automerger@android.com> Thu Dec 05 12:29:14 2013 -0800
tree 86b1dc5c5eb31b97162595e7488083970f7b4b27
parent f62167e88c0c1b9621f2984f1a59ae7d41cf4c88
parent 243e04f81f9bef56ff5663bc25d280c7c33beb87

am 243e04f8: Merge "Treat VER_2_1_DEVEL the same as VER_0_8_X"

* commit '243e04f81f9bef56ff5663bc25d280c7c33beb87':
  Treat VER_2_1_DEVEL the same as VER_0_8_X
  Android: Do not compile wpa_supplicant if not chosen

Android.mk

diff --git a/Android.mk b/Android.mk
index 4a74b24..bd7a409 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,9 +1,6 @@
 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)
+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
@@ -11,6 +8,3 @@
 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