diff options
| author | Ying Wang <wangying@google.com> | 2013-12-05 19:13:46 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-12-05 19:13:46 +0000 |
| commit | 243e04f81f9bef56ff5663bc25d280c7c33beb87 (patch) | |
| tree | fe745e7d5d18398958d93c6ab0d22bdf9aa686d7 | |
| parent | 4752b4046c7bd253ff4aed0019381521f907d7be (diff) | |
| parent | 966cdfc951309c0a13b9d167a2a2077b7dfaa07d (diff) | |
| download | wpa_supplicant_8-243e04f81f9bef56ff5663bc25d280c7c33beb87.tar.gz | |
Merge "Treat VER_2_1_DEVEL the same as VER_0_8_X"
| -rw-r--r-- | Android.mk | 5 |
1 files changed, 1 insertions, 4 deletions
@@ -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 |