diff options
| author | Elliott Hughes <enh@google.com> | 2014-04-24 16:19:17 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-04-24 16:19:17 +0000 |
| commit | 847fd0311f6c82b8ac90d970cfc68aafd9913471 (patch) | |
| tree | 03ebfe7311263b7a4d37278f70dab780a73d39ec | |
| parent | 1076c5685b1f1dd0f8b691466f6e16259722ca56 (diff) | |
| parent | 2c8e95528c450008c79795b4539f735444264d6e (diff) | |
| download | build-847fd0311f6c82b8ac90d970cfc68aafd9913471.tar.gz | |
Merge "Leave 'linux' defined on x86/x86-64, like arm."
| -rw-r--r-- | core/combo/TARGET_linux-x86.mk | 1 | ||||
| -rw-r--r-- | core/combo/TARGET_linux-x86_64.mk | 1 |
2 files changed, 0 insertions, 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 \ |