Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9604c068 authored May 09, 2014 by Andrew Hsieh Committed by Android Git Automerger May 09, 2014

am a01cb054: am c581e10a: am eca0043b: Merge "Disable canonical prefixes of system headers"

* commit 'a01cb054':
  Disable canonical prefixes of system headers

parents 38e49504 a01cb054

core/clang/config.mk

+2 −1

Original line number	Diff line number	Diff line
		@@ -31,7 +31,8 @@ CLANG_CONFIG_UNKNOWN_CFLAGS := \
		-funswitch-loops \
		-Wno-psabi \
		-Wno-unused-but-set-variable \
		-Wno-unused-but-set-parameter
		-Wno-unused-but-set-parameter \
		-fno-canonical-system-headers

		# Clang flags for all host rules
		CLANG_CONFIG_HOST_EXTRA_ASFLAGS :=

core/combo/HOST_linux-x86.mk

+2 −1

Original line number	Diff line number	Diff line
		@@ -52,6 +52,7 @@ HOST_GLOBAL_LDFLAGS += -static
		endif # BUILD_HOST_static

		HOST_GLOBAL_CFLAGS += -fPIC \
		-no-canonical-prefixes \
		-include $(call select-android-config-h,linux-x86)

		# Disable new longjmp in glibc 2.11 and later. See bug 2967937.

core/combo/TARGET_linux-arm.mk

+2 −0

Original line number	Diff line number	Diff line
		@@ -103,6 +103,8 @@ $(combo_2nd_arch_prefix)TARGET_GLOBAL_CFLAGS += \
		-Werror=format-security \
		-D_FORTIFY_SOURCE=2 \
		-fno-short-enums \
		-no-canonical-prefixes \
		-fno-canonical-system-headers \
		$(arch_variant_cflags) \
		-include $(android_config_h) \
		-I $(dir $(android_config_h))

core/combo/TARGET_linux-arm64.mk

+2 −0

Original line number	Diff line number	Diff line
		@@ -87,6 +87,8 @@ TARGET_GLOBAL_CFLAGS += \
		-Werror=format-security \
		-D_FORTIFY_SOURCE=2 \
		-fno-short-enums \
		-no-canonical-prefixes \
		-fno-canonical-system-headers \
		$(arch_variant_cflags) \
		-include $(android_config_h) \
		-I $(dir $(android_config_h))

core/combo/TARGET_linux-mips.mk

+2 −0

Original line number	Diff line number	Diff line
		@@ -90,6 +90,8 @@ $(combo_2nd_arch_prefix)TARGET_GLOBAL_CFLAGS += \
		-Wa,--noexecstack \
		-Werror=format-security \
		-D_FORTIFY_SOURCE=2 \
		-no-canonical-prefixes \
		-fno-canonical-system-headers \
		$(arch_variant_cflags) \
		-include $(android_config_h) \
		-I $(dir $(android_config_h))