diff options
| -rw-r--r-- | lib/System/Android.mk | 2 | ||||
| -rw-r--r-- | llvm-device-build.mk | 14 |
2 files changed, 13 insertions, 3 deletions
diff --git a/lib/System/Android.mk b/lib/System/Android.mk index d48bc44..ea3e2fc 100644 --- a/lib/System/Android.mk +++ b/lib/System/Android.mk @@ -44,7 +44,9 @@ REQUIRES_RTTI := 1 LOCAL_SRC_FILES := $(system_SRC_FILES) +ifneq ($(TARGET_SIMULATOR),true) LOCAL_CFLAGS += -I bionic/libc/include +endif LOCAL_MODULE:= libLLVMSystem diff --git a/llvm-device-build.mk b/llvm-device-build.mk index 17532a0..b8f38c7 100644 --- a/llvm-device-build.mk +++ b/llvm-device-build.mk @@ -2,7 +2,6 @@ LOCAL_CFLAGS := \ -D_GNU_SOURCE \ -D__STDC_LIMIT_MACROS \ -D__STDC_CONSTANT_MACROS \ - -DANDROID_TARGET_BUILD \ -O2 \ -fomit-frame-pointer \ -Wall \ @@ -11,6 +10,10 @@ LOCAL_CFLAGS := \ -Wwrite-strings \ $(LOCAL_CFLAGS) +ifneq ($(TARGET_SIMULATOR),true) +LOCAL_CFLAGS := -DANDROID_TARGET_BUILD $(LOCAL_CFLAGS) +endif + ifeq ($(LLVM_ENABLE_ASSERTION),true) LOCAL_CFLAGS := \ -D_DEBUG \ @@ -38,13 +41,18 @@ LOCAL_CPPFLAGS := \ # 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 ########################################################### |