commit 26000a4b9b9a5ee9ffff6cedfbf96a9f422d4bef
author Chia-chi Yeh <chiachi@android.com> Sun Sep 20 23:06:25 2009 -0700
committer Android Git Automerger <android-git-automerger@android.com> Sun Sep 20 23:06:25 2009 -0700
tree 0873fa001bdfb48a4ca470f3e74c95cc08ee6e06
parent 04fb769a50c3e5b3bcc97b22c24863d31c63df61
parent ee46392362e5242809b4337700cc5660086f8f80

am ee463923: am d5170539: wpa_supplicant: switch to multi-user keystore.

Merge commit 'ee46392362e5242809b4337700cc5660086f8f80'

* commit 'ee46392362e5242809b4337700cc5660086f8f80':
  wpa_supplicant: switch to multi-user keystore.

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