From b0462e6ae2338f1fa7cc0ed7aa36887713185a15 Mon Sep 17 00:00:00 2001
From: Jeff Brown <jeffbrown@google.com>
Date: Mon, 11 Jul 2011 22:11:45 -0700
Subject: [PATCH] Remove the simulator target from all makefiles. Bug: 5010576

Change-Id: Ib465fdb42c8621899bea15c04a427d7ab1641a8c
---
 Android.mk            | 4 ----
 applypatch/Android.mk | 4 ----
 mtdutils/Android.mk   | 4 ----
 tools/ota/Android.mk  | 4 ----
 4 files changed, 16 deletions(-)

diff --git a/Android.mk b/Android.mk
index 508eb4c6..282862fc 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,5 +1,3 @@
-ifneq ($(TARGET_SIMULATOR),true)
-
 LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 
@@ -74,5 +72,3 @@ include $(commands_recovery_local_path)/edify/Android.mk
 include $(commands_recovery_local_path)/updater/Android.mk
 include $(commands_recovery_local_path)/applypatch/Android.mk
 commands_recovery_local_path :=
-
-endif    # !TARGET_SIMULATOR
diff --git a/applypatch/Android.mk b/applypatch/Android.mk
index 2848b517..0e529d4c 100644
--- a/applypatch/Android.mk
+++ b/applypatch/Android.mk
@@ -12,8 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-ifneq ($(TARGET_SIMULATOR),true)
-
 LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 
@@ -57,5 +55,3 @@ LOCAL_C_INCLUDES += external/zlib external/bzip2
 LOCAL_STATIC_LIBRARIES += libz libbz
 
 include $(BUILD_HOST_EXECUTABLE)
-
-endif  # !TARGET_SIMULATOR
diff --git a/mtdutils/Android.mk b/mtdutils/Android.mk
index 41665369..ef417fa1 100644
--- a/mtdutils/Android.mk
+++ b/mtdutils/Android.mk
@@ -1,5 +1,3 @@
-ifneq ($(TARGET_SIMULATOR),true)
-
 LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 
@@ -18,5 +16,3 @@ LOCAL_MODULE_TAGS := eng
 LOCAL_STATIC_LIBRARIES := libmtdutils
 LOCAL_SHARED_LIBRARIES := libcutils libc
 include $(BUILD_EXECUTABLE)
-
-endif	# !TARGET_SIMULATOR
diff --git a/tools/ota/Android.mk b/tools/ota/Android.mk
index 0bde7ee7..142c3b25 100644
--- a/tools/ota/Android.mk
+++ b/tools/ota/Android.mk
@@ -14,8 +14,6 @@
 
 LOCAL_PATH := $(call my-dir)
 
-ifneq ($(TARGET_SIMULATOR),true)
-
 include $(CLEAR_VARS)
 LOCAL_FORCE_STATIC_EXECUTABLE := true
 LOCAL_MODULE := add-property-tag
@@ -33,5 +31,3 @@ LOCAL_MODULE_TAGS := debug
 LOCAL_SRC_FILES := check-lost+found.c
 LOCAL_STATIC_LIBRARIES := libcutils libc
 include $(BUILD_EXECUTABLE)
-
-endif  # !TARGET_SIMULATOR