p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

resolved conflicts for merge of 3e91f5ad to jb-mr1-dev 

Change-Id: I9b587bc6086e1edacc98879e43668001bf72f7db
This commit is contained in:
Andrew Hsieh 2012-09-12 15:27:59 -07:00
parent 063d0c5dee 3e91f5ad76
commit 5630521aba
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -93,7 +93,8 @@ TARGET_GLOBAL_CFLAGS += \
-fno-short-enums \
-fstrict-aliasing \
-funswitch-loops \
-funwind-tables
-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))