From 8fcabc681760a390dc9ce16de57162e52e39058b Mon Sep 17 00:00:00 2001 From: Ying Wang Date: Mon, 25 Nov 2013 10:45:06 -0800 Subject: [PATCH] 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 --- Android.mk | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) 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