From 4482f1fbc477aeb1ee08e4a395e98af62afcb2b3 Mon Sep 17 00:00:00 2001
From: Jeff Brown <jeffbrown@google.com>
Date: Wed, 23 Nov 2011 17:56:41 +0200
Subject: [PATCH] Android: Remove the simulator target from all makefiles

This is commit bbda627478b0e9a312fea4662cd7cd8d6bdf82bf from
Android wpa_supplicant_8.git.
---
 hostapd/Android.mk        | 8 +++-----
 wpa_supplicant/Android.mk | 8 +++-----
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/hostapd/Android.mk b/hostapd/Android.mk
index 04fd77112..46f2cd6e1 100644
--- a/hostapd/Android.mk
+++ b/hostapd/Android.mk
@@ -1,11 +1,9 @@
 LOCAL_PATH := $(call my-dir)
 
 WPA_BUILD_HOSTAPD := false
-ifneq ($(TARGET_SIMULATOR),true)
-  ifneq ($(BOARD_HOSTAPD_DRIVER),)
-    WPA_BUILD_HOSTAPD := true
-    CONFIG_DRIVER_$(BOARD_HOSTAPD_DRIVER) := y
-  endif
+ifneq ($(BOARD_HOSTAPD_DRIVER),)
+  WPA_BUILD_HOSTAPD := true
+  CONFIG_DRIVER_$(BOARD_HOSTAPD_DRIVER) := y
 endif
 
 include $(LOCAL_PATH)/.config
diff --git a/wpa_supplicant/Android.mk b/wpa_supplicant/Android.mk
index ef5105fdd..9bf76a2b7 100644
--- a/wpa_supplicant/Android.mk
+++ b/wpa_supplicant/Android.mk
@@ -19,11 +19,9 @@ LOCAL_PATH := $(call my-dir)
 PKG_CONFIG ?= pkg-config
 
 WPA_BUILD_SUPPLICANT := false
-ifneq ($(TARGET_SIMULATOR),true)
-  ifneq ($(BOARD_WPA_SUPPLICANT_DRIVER),)
-    WPA_BUILD_SUPPLICANT := true
-    CONFIG_DRIVER_$(BOARD_WPA_SUPPLICANT_DRIVER) := y
-  endif
+ifneq ($(BOARD_WPA_SUPPLICANT_DRIVER),)
+  WPA_BUILD_SUPPLICANT := true
+  CONFIG_DRIVER_$(BOARD_WPA_SUPPLICANT_DRIVER) := y
 endif
 
 include $(LOCAL_PATH)/.config