From 2c8e95528c450008c79795b4539f735444264d6e Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Wed, 23 Apr 2014 23:09:30 -0700 Subject: [PATCH] Leave 'linux' defined on x86/x86-64, like arm. Change-Id: I53013a45c19a643a985de3f339b8b3f8f4dc39d2 --- core/combo/TARGET_linux-x86.mk | 1 - core/combo/TARGET_linux-x86_64.mk | 1 - 2 files changed, 2 deletions(-) diff --git a/core/combo/TARGET_linux-x86.mk b/core/combo/TARGET_linux-x86.mk index 1361be2960..01f8242bd1 100644 --- a/core/combo/TARGET_linux-x86.mk +++ b/core/combo/TARGET_linux-x86.mk @@ -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 \ diff --git a/core/combo/TARGET_linux-x86_64.mk b/core/combo/TARGET_linux-x86_64.mk index 2e06263d25..a5a745b4cc 100644 --- a/core/combo/TARGET_linux-x86_64.mk +++ b/core/combo/TARGET_linux-x86_64.mk @@ -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 \