Patchwork Treat VER_2_1_DEVEL the same as VER_0_8_X

login
register
mail settings
Submitter Ying Wang
Date Nov. 25, 2013, 6:45 p.m.
Message ID <20131209221552.421F513FA37@ushik.mtv.corp.google.com>
Download mbox | patch
Permalink /patch/299217/
State Accepted
Headers show

Comments

Ying Wang - Nov. 25, 2013, 6:45 p.m.
The Android.mks to include are actually the same.

Change-Id: I0ca51e744c9f1f09812f20064c0ae316856e0dc4
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
---
 Android.mk | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
Jouni Malinen - Dec. 15, 2013, 5:58 a.m.
On Mon, Nov 25, 2013 at 10:45:06AM -0800, Ying Wang wrote:
> The Android.mks to include are actually the same.

Thanks, applied.

Patch

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