commit 1325e3e451a4f915dde5d417d66de5406c859a4b
author Chia-chi Yeh <chiachi@android.com> Mon Oct 12 11:24:48 2009 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Oct 12 11:24:48 2009 -0700
tree dd0f35900a37212d9be137c0eee3bfd84cfbc801
parent cff7b89a36020a1ecc24736d441ffa5cdca95876
parent 3630a058cb0c57d0f6da9568098471163535d4cf

am 3630a058: wpa_supplicant: push keystore access to tls_openssl.c.

Merge commit '3630a058cb0c57d0f6da9568098471163535d4cf'

* commit '3630a058cb0c57d0f6da9568098471163535d4cf':
  wpa_supplicant: push keystore access to tls_openssl.c.

Android.mk

diff --git a/Android.mk b/Android.mk
index 5e8f07f..09a73eb 100644
--- a/Android.mk
+++ b/Android.mk
@@ -13,6 +13,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+ifndef WPA_SUPPLICANT_VERSION
+WPA_SUPPLICANT_VERSION := VER_0_5_X
+endif
+
+ifeq ($(WPA_SUPPLICANT_VERSION),VER_0_5_X)
+
 LOCAL_PATH := $(call my-dir)
 
 WPA_BUILD_SUPPLICANT := false
@@ -716,3 +722,5 @@
 LOCAL_COPY_HEADERS_TO := libwpa_client
 LOCAL_COPY_HEADERS := wpa_ctrl.h
 include $(BUILD_SHARED_LIBRARY)
+
+endif # VER_0_5_X