am 52db54cc: am bb21bfb0: am 7cad688e: am 847fd031: Merge "Leave \'linux\' defined on x86/x86-64, like arm."

* commit '52db54cc8ea48730a4375c09bd3baf0b9554dcb3':
  Leave 'linux' defined on x86/x86-64, like arm.
This commit is contained in:
Elliott Hughes 2014-04-24 16:38:20 +00:00 committed by Android Git Automerger
commit 6ee42ec18c
2 changed files with 0 additions and 2 deletions

View file

@ -106,7 +106,6 @@ android_config_h := $(call select-android-config-h,target_linux-x86)
$(combo_2nd_arch_prefix)TARGET_GLOBAL_CFLAGS += \ $(combo_2nd_arch_prefix)TARGET_GLOBAL_CFLAGS += \
-O2 \ -O2 \
-Ulinux \
-Wa,--noexecstack \ -Wa,--noexecstack \
-Werror=format-security \ -Werror=format-security \
-D_FORTIFY_SOURCE=2 \ -D_FORTIFY_SOURCE=2 \

View file

@ -106,7 +106,6 @@ KERNEL_HEADERS := $(KERNEL_HEADERS_COMMON) $(KERNEL_HEADERS_ARCH)
TARGET_GLOBAL_CFLAGS += \ TARGET_GLOBAL_CFLAGS += \
-O2 \ -O2 \
-Ulinux \
-Wa,--noexecstack \ -Wa,--noexecstack \
-Werror=format-security \ -Werror=format-security \
-D_FORTIFY_SOURCE=2 \ -D_FORTIFY_SOURCE=2 \