Remove the simulator target from all makefiles.
Bug: 5010576
Change-Id: Id9fb33c51f84d90f9540cfc3f6f2f4940ee54dd7
diff --git a/Android.mk b/Android.mk
index b7c9258..33043a5 100644
--- a/Android.mk
+++ b/Android.mk
@@ -14,8 +14,6 @@
# limitations under the License.
#
-ifneq ($(TARGET_SIMULATOR),true)
-
local_cflags_for_libbcc := -Wall -Wno-unused-parameter -Werror
ifneq ($(TARGET_BUILD_VARIANT),eng)
local_cflags_for_libbcc += -D__DISABLE_ASSERTS
@@ -334,5 +332,3 @@
# Build children
# ========================================================
include $(call all-makefiles-under,$(LOCAL_PATH))
-
-endif # TARGET_SIMULATOR != true
diff --git a/lib/ScriptCRT/Android.mk b/lib/ScriptCRT/Android.mk
index 552ff0d..7cbcb98 100644
--- a/lib/ScriptCRT/Android.mk
+++ b/lib/ScriptCRT/Android.mk
@@ -14,7 +14,6 @@
# limitations under the License.
#
-ifneq ($(TARGET_SIMULATOR),true)
LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
@@ -49,5 +48,3 @@
$(LOCAL_BUILT_MODULE) : $(clcore_bc_files) $(clcore_LLVM_LINK)
@mkdir -p $(dir $@)
$(hide) $(clcore_LLVM_LINK) $(PRIVATE_BC_FILES) -o $@
-
-endif