summaryrefslogtreecommitdiffstats
path: root/core/combo
diff options
context:
space:
mode:
authorBen Cheng <bccheng@google.com>2014-02-07 21:36:45 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2014-02-07 21:36:46 +0000
commit6c5d89764848b604c01d0dca7104d9e075aed2b2 (patch)
tree454d7cad9061c912118c94174227e2b739d514f0 /core/combo
parent5cc7f8a720fdeb2c2ec46b6ec212d05587e76163 (diff)
parent859c826ffc5d64599c4524f5ca84e5c4210cea96 (diff)
downloadbuild-6c5d89764848b604c01d0dca7104d9e075aed2b2.zip
build-6c5d89764848b604c01d0dca7104d9e075aed2b2.tar.gz
build-6c5d89764848b604c01d0dca7104d9e075aed2b2.tar.bz2
Merge "Refreshed gcc predefines __ANDROID__"
Diffstat (limited to 'core/combo')
-rw-r--r--core/combo/TARGET_linux-arm64.mk3
1 files changed, 0 insertions, 3 deletions
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 @@ TARGET_GLOBAL_CFLAGS += \
-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: