jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Treat VER_2_1_DEVEL the same as VER_0_8_X

Browse source 
The Android.mks to include are actually the same.

Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
This commit is contained in:
Ying Wang 2013-11-25 10:45:06 -08:00 committed by Jouni Malinen
parent b154a24e83
commit 8fcabc6817
1 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Android.mk
View file

@ -1,6 +1,6 @@
LOCAL_PATH:= $(call my-dir) 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! # The order of the 2 Android.mks does matter!
# TODO: Clean up the Android.mks, reset all the temporary variables at the # 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 # 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 \ include $(LOCAL_PATH)/hostapd/Android.mk \
$(LOCAL_PATH)/wpa_supplicant/Android.mk $(LOCAL_PATH)/wpa_supplicant/Android.mk
endif endif
ifeq ($(WPA_SUPPLICANT_VERSION),VER_2_1_DEVEL)
include $(call all-subdir-makefiles)
endif