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

Commit 7cad688e authored by Elliott Hughes's avatar Elliott Hughes Committed by Android Git Automerger
Browse files

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

* commit '847fd031':
  Leave 'linux' defined on x86/x86-64, like arm.
parents 62911d47 847fd031

core/combo/TARGET_linux-x86.mk

+0 −1
Original line number Diff line number Diff line
@@ -106,7 +106,6 @@ android_config_h := $(call select-android-config-h,target_linux-x86) 


$(combo_2nd_arch_prefix)TARGET_GLOBAL_CFLAGS += \

			-O2 \

			-Ulinux \

			-Wa,--noexecstack \

			-Werror=format-security \

			-D_FORTIFY_SOURCE=2 \

core/combo/TARGET_linux-x86_64.mk

+0 −1
Original line number Diff line number Diff line
@@ -106,7 +106,6 @@ KERNEL_HEADERS := $(KERNEL_HEADERS_COMMON) $(KERNEL_HEADERS_ARCH) 


TARGET_GLOBAL_CFLAGS += \

			-O2 \

			-Ulinux \

			-Wa,--noexecstack \

			-Werror=format-security \

			-D_FORTIFY_SOURCE=2 \