Android: Remove the simulator target from all makefiles

This is commit bbda627478b0e9a312fea4662cd7cd8d6bdf82bf from
Android wpa_supplicant_8.git.

diff --git a/hostapd/Android.mk b/hostapd/Android.mk
index 04fd77112d8ff721a199f29139c556f6d31161c4..46f2cd6e1419d48ff3cc911303b40156bde9567a 100644 (file)
--- 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 ef5105fdde00936c8ba54e6f7696e500a5700b03..9bf76a2b7bbccfdf479808b23b4ec7441fbbb757 100644 (file)
--- 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