commit 7495e68a61075ef592aff6f2ba4d1d06fe3fedf4
author Ben Cheng <bccheng@google.com> Fri Feb 07 21:40:49 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Feb 07 21:40:49 2014 +0000
tree becf74e5bc0ec577d4e6cb419097094d0ed2a81d
parent 34afc565b41989f07d6e479def5e849aeaad1ac9
parent 6c5d89764848b604c01d0dca7104d9e075aed2b2

am 6c5d8976: Merge "Refreshed gcc predefines __ANDROID__"

* commit '6c5d89764848b604c01d0dca7104d9e075aed2b2':
  Refreshed gcc predefines __ANDROID__

core/combo/TARGET_linux-arm64.mk

diff --git a/core/combo/TARGET_linux-arm64.mk b/core/combo/TARGET_linux-arm64.mk
index 83fda7b..2d344de 100644
--- a/core/combo/TARGET_linux-arm64.mk
+++ b/core/combo/TARGET_linux-arm64.mk
@@ -101,9 +101,6 @@
     -Werror=pointer-to-int-cast \
     -Werror=int-to-pointer-cast \
 
-# TODO - remove __ANDROID__ after the next aarch64 toolchain refresh
-TARGET_GLOBAL_CFLAGS += -D__ANDROID__=1
-
 TARGET_GLOBAL_CFLAGS += -fno-strict-volatile-bitfields
 
 # This is to avoid the dreaded warning compiler message: