commit 2ad7d4df0746e7e16fd3cc39d14fa352801abcae
author Ben Cheng <bccheng@google.com> Mon Feb 10 12:50:55 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Feb 10 12:50:55 2014 +0000
tree 2938d2b92b346fa1ad13b4f803f0a4666dd456c8
parent 956cd054683308b3de25401e64dfc8abda795de9
parent 7495e68a61075ef592aff6f2ba4d1d06fe3fedf4

am 7495e68a: am 6c5d8976: Merge "Refreshed gcc predefines __ANDROID__"

* commit '7495e68a61075ef592aff6f2ba4d1d06fe3fedf4':
  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: