StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 3208b615: am fc8b6338: resolved conflicts for merge of d65a7da3 to jb-mr2-dev-plus-aosp

Browse Source 
* commit '3208b615c5cde2b682c3bbbcd2bb064b14b57489':
  No need to filter out AndroidConfig.h for unbundled build
This commit is contained in:
Ying Wang
2013-08-15 14:42:57 -07:00
committed by Android Git Automerger
parent 461cac9796 3208b615c5
commit 0634a437a3
4 changed files with 19 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/combo/TARGET_linux-x86.mk
View File

@@ -115,6 +115,8 @@ else
endif
KERNEL_HEADERS := $(KERNEL_HEADERS_COMMON) $(KERNEL_HEADERS_ARCH)
android_config_h := $(call select-android-config-h,target_linux-x86)
TARGET_GLOBAL_CFLAGS += \
-O2 \
-Ulinux \
@@ -131,11 +133,9 @@ TARGET_GLOBAL_CFLAGS += \
-fstrict-aliasing \
-funswitch-loops \
-funwind-tables \
-fstack-protector
android_config_h := $(call select-android-config-h,target_linux-x86)
TARGET_ANDROID_CONFIG_CFLAGS := -include $(android_config_h) -I $(dir $(android_config_h))
TARGET_GLOBAL_CFLAGS += $(TARGET_ANDROID_CONFIG_CFLAGS)
-fstack-protector \
-include $(android_config_h) \
-I $(dir $(android_config_h))
# XXX: Not sure this is still needed. Must check with our toolchains.
TARGET_GLOBAL_CPPFLAGS += \