summaryrefslogtreecommitdiffstats
path: root/core/combo/HOST_linux-x86.mk
diff options
context:
space:
mode:
authorYing Wang <wangying@google.com>2012-09-20 10:06:33 -0700
committerYing Wang <wangying@google.com>2012-09-20 10:33:20 -0700
commit5bdf305bbe529a85735200353478057b65bb462e (patch)
tree334ad6745270249d18994f2c45f4118e5615a395 /core/combo/HOST_linux-x86.mk
parent4da2f9caaab5ad95528eece0453ea95a1aa3a4e5 (diff)
downloadbuild-5bdf305bbe529a85735200353478057b65bb462e.zip
build-5bdf305bbe529a85735200353478057b65bb462e.tar.gz
build-5bdf305bbe529a85735200353478057b65bb462e.tar.bz2
Move AndroidConfig.h from system/core to the build project.
So unbundled branches don't need to include the system/core project. Change-Id: Ic4ef62ee6df069b9b2dd123aed95a3e7fcdfc146
Diffstat (limited to 'core/combo/HOST_linux-x86.mk')
-rw-r--r--core/combo/HOST_linux-x86.mk7
1 files changed, 2 insertions, 5 deletions
diff --git a/core/combo/HOST_linux-x86.mk b/core/combo/HOST_linux-x86.mk
index cb5f004..28c8f8c 100644
--- a/core/combo/HOST_linux-x86.mk
+++ b/core/combo/HOST_linux-x86.mk
@@ -57,11 +57,8 @@ ifneq ($(strip $(BUILD_HOST_static)),)
HOST_GLOBAL_LDFLAGS += -static
endif # BUILD_HOST_static
-HOST_GLOBAL_CFLAGS += -fPIC
-ifeq (,$(TARGET_BUILD_APPS))
-HOST_GLOBAL_CFLAGS += \
- -include $(call select-android-config-h,linux-x86)
-endif
+HOST_GLOBAL_CFLAGS += -fPIC \
+ -include $(call select-android-config-h,linux-x86)
# Disable new longjmp in glibc 2.11 and later. See bug 2967937.
HOST_GLOBAL_CFLAGS += -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0