Remove the simulator target from all makefiles.
Bug: 5010576
Change-Id: Ia82a523b49d44a2d806867d0ff931a15a10f980b
diff --git a/llvm-device-build.mk b/llvm-device-build.mk
index 83fc5ef..e1ce56d 100644
--- a/llvm-device-build.mk
+++ b/llvm-device-build.mk
@@ -10,7 +10,6 @@
-Wwrite-strings \
$(LOCAL_CFLAGS)
-ifneq ($(TARGET_SIMULATOR),true)
# The three inline options together reduce libbcc.so almost 1MB.
# We move them from global build/core/combo/TARGET_linux-arm.mk
# to here.
@@ -19,7 +18,6 @@
-finline-functions \
-fno-inline-functions-called-once \
$(LOCAL_CFLAGS)
-endif
ifeq ($(LLVM_ENABLE_ASSERTION),true)
LOCAL_CFLAGS := \
@@ -49,18 +47,13 @@
# Make sure bionic is first so we can include system headers.
LOCAL_C_INCLUDES := \
+ bionic \
+ external/stlport/stlport \
$(LLVM_ROOT_PATH) \
$(LLVM_ROOT_PATH)/include \
$(LLVM_ROOT_PATH)/device/include \
$(LOCAL_C_INCLUDES)
-ifneq ($(TARGET_SIMULATOR),true)
-LOCAL_C_INCLUDES := \
- bionic \
- external/stlport/stlport \
- $(LOCAL_C_INCLUDES)
-endif
-
###########################################################
## Commands for running tblgen to compile a td file
###########################################################