commit 52db54cc8ea48730a4375c09bd3baf0b9554dcb3
author Elliott Hughes <enh@google.com> Thu Apr 24 16:32:55 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Apr 24 16:32:55 2014 +0000
tree ac5d12f09b13f1582867d8bcfb731692bf285fd4
parent 1d753dda0afe74cdb59a0e6947e757b7ad831dc2
parent bb21bfb090c29be17473b318a0d54ec5bcc5243c

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

* commit 'bb21bfb090c29be17473b318a0d54ec5bcc5243c':
  Leave 'linux' defined on x86/x86-64, like arm.

core/combo/TARGET_linux-x86.mk

diff --git a/core/combo/TARGET_linux-x86.mk b/core/combo/TARGET_linux-x86.mk
index 1361be2..01f8242 100644
--- a/core/combo/TARGET_linux-x86.mk
+++ b/core/combo/TARGET_linux-x86.mk
@@ -106,7 +106,6 @@
 
 $(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

diff --git a/core/combo/TARGET_linux-x86_64.mk b/core/combo/TARGET_linux-x86_64.mk
index 2e06263..a5a745b 100644
--- a/core/combo/TARGET_linux-x86_64.mk
+++ b/core/combo/TARGET_linux-x86_64.mk
@@ -106,7 +106,6 @@
 
 TARGET_GLOBAL_CFLAGS += \
 			-O2 \
-			-Ulinux \
 			-Wa,--noexecstack \
 			-Werror=format-security \
 			-D_FORTIFY_SOURCE=2 \