From c16ca2fe0309277c39a3407c73418802e48cdb14 Mon Sep 17 00:00:00 2001 From: "Torne (Richard Coles)" Date: Fri, 5 Dec 2014 11:13:57 +0000 Subject: Temporarily disable -Werror in Chromium. Temporarily disable the use of -Werror in the AOSP copy of Chromium so that the system-wide default warnings can be changed without breaking Chromium. We'll re-enable it once the warnings are settled and we've fixed any issues. Bug: 18632512 Change-Id: I97dce9f3178888b2901f1cda7ce818cdf4295198 --- ots.target.darwin-arm.mk | 4 ++-- ots.target.darwin-arm64.mk | 4 ++-- ots.target.darwin-x86.mk | 4 ++-- ots.target.darwin-x86_64.mk | 4 ++-- ots.target.linux-arm.mk | 4 ++-- ots.target.linux-arm64.mk | 4 ++-- ots.target.linux-x86.mk | 4 ++-- ots.target.linux-x86_64.mk | 4 ++-- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/ots.target.darwin-arm.mk b/ots.target.darwin-arm.mk index 5fb1b71..93aa479 100644 --- a/ots.target.darwin-arm.mk +++ b/ots.target.darwin-arm.mk @@ -63,7 +63,7 @@ LOCAL_SRC_FILES := \ MY_CFLAGS_Debug := \ -fstack-protector \ --param=ssp-buffer-size=4 \ - -Werror \ + \ -fno-strict-aliasing \ -Wall \ -Wno-unused-parameter \ @@ -163,7 +163,7 @@ LOCAL_CPPFLAGS_Debug := \ MY_CFLAGS_Release := \ -fstack-protector \ --param=ssp-buffer-size=4 \ - -Werror \ + \ -fno-strict-aliasing \ -Wall \ -Wno-unused-parameter \ diff --git a/ots.target.darwin-arm64.mk b/ots.target.darwin-arm64.mk index 35788d2..e8c4573 100644 --- a/ots.target.darwin-arm64.mk +++ b/ots.target.darwin-arm64.mk @@ -62,7 +62,7 @@ LOCAL_SRC_FILES := \ # Flags passed to both C and C++ files. MY_CFLAGS_Debug := \ --param=ssp-buffer-size=4 \ - -Werror \ + \ -fno-strict-aliasing \ -Wall \ -Wno-unused-parameter \ @@ -150,7 +150,7 @@ LOCAL_CPPFLAGS_Debug := \ # Flags passed to both C and C++ files. MY_CFLAGS_Release := \ --param=ssp-buffer-size=4 \ - -Werror \ + \ -fno-strict-aliasing \ -Wall \ -Wno-unused-parameter \ diff --git a/ots.target.darwin-x86.mk b/ots.target.darwin-x86.mk index 1319b81..8c27410 100644 --- a/ots.target.darwin-x86.mk +++ b/ots.target.darwin-x86.mk @@ -62,7 +62,7 @@ LOCAL_SRC_FILES := \ # Flags passed to both C and C++ files. MY_CFLAGS_Debug := \ --param=ssp-buffer-size=4 \ - -Werror \ + \ -fno-strict-aliasing \ -Wall \ -Wno-unused-parameter \ @@ -156,7 +156,7 @@ LOCAL_CPPFLAGS_Debug := \ # Flags passed to both C and C++ files. MY_CFLAGS_Release := \ --param=ssp-buffer-size=4 \ - -Werror \ + \ -fno-strict-aliasing \ -Wall \ -Wno-unused-parameter \ diff --git a/ots.target.darwin-x86_64.mk b/ots.target.darwin-x86_64.mk index 5b0cea6..e64fa21 100644 --- a/ots.target.darwin-x86_64.mk +++ b/ots.target.darwin-x86_64.mk @@ -63,7 +63,7 @@ LOCAL_SRC_FILES := \ MY_CFLAGS_Debug := \ -fstack-protector \ --param=ssp-buffer-size=4 \ - -Werror \ + \ -fno-strict-aliasing \ -Wall \ -Wno-unused-parameter \ @@ -156,7 +156,7 @@ LOCAL_CPPFLAGS_Debug := \ MY_CFLAGS_Release := \ -fstack-protector \ --param=ssp-buffer-size=4 \ - -Werror \ + \ -fno-strict-aliasing \ -Wall \ -Wno-unused-parameter \ diff --git a/ots.target.linux-arm.mk b/ots.target.linux-arm.mk index 5fb1b71..93aa479 100644 --- a/ots.target.linux-arm.mk +++ b/ots.target.linux-arm.mk @@ -63,7 +63,7 @@ LOCAL_SRC_FILES := \ MY_CFLAGS_Debug := \ -fstack-protector \ --param=ssp-buffer-size=4 \ - -Werror \ + \ -fno-strict-aliasing \ -Wall \ -Wno-unused-parameter \ @@ -163,7 +163,7 @@ LOCAL_CPPFLAGS_Debug := \ MY_CFLAGS_Release := \ -fstack-protector \ --param=ssp-buffer-size=4 \ - -Werror \ + \ -fno-strict-aliasing \ -Wall \ -Wno-unused-parameter \ diff --git a/ots.target.linux-arm64.mk b/ots.target.linux-arm64.mk index 35788d2..e8c4573 100644 --- a/ots.target.linux-arm64.mk +++ b/ots.target.linux-arm64.mk @@ -62,7 +62,7 @@ LOCAL_SRC_FILES := \ # Flags passed to both C and C++ files. MY_CFLAGS_Debug := \ --param=ssp-buffer-size=4 \ - -Werror \ + \ -fno-strict-aliasing \ -Wall \ -Wno-unused-parameter \ @@ -150,7 +150,7 @@ LOCAL_CPPFLAGS_Debug := \ # Flags passed to both C and C++ files. MY_CFLAGS_Release := \ --param=ssp-buffer-size=4 \ - -Werror \ + \ -fno-strict-aliasing \ -Wall \ -Wno-unused-parameter \ diff --git a/ots.target.linux-x86.mk b/ots.target.linux-x86.mk index 1319b81..8c27410 100644 --- a/ots.target.linux-x86.mk +++ b/ots.target.linux-x86.mk @@ -62,7 +62,7 @@ LOCAL_SRC_FILES := \ # Flags passed to both C and C++ files. MY_CFLAGS_Debug := \ --param=ssp-buffer-size=4 \ - -Werror \ + \ -fno-strict-aliasing \ -Wall \ -Wno-unused-parameter \ @@ -156,7 +156,7 @@ LOCAL_CPPFLAGS_Debug := \ # Flags passed to both C and C++ files. MY_CFLAGS_Release := \ --param=ssp-buffer-size=4 \ - -Werror \ + \ -fno-strict-aliasing \ -Wall \ -Wno-unused-parameter \ diff --git a/ots.target.linux-x86_64.mk b/ots.target.linux-x86_64.mk index 5b0cea6..e64fa21 100644 --- a/ots.target.linux-x86_64.mk +++ b/ots.target.linux-x86_64.mk @@ -63,7 +63,7 @@ LOCAL_SRC_FILES := \ MY_CFLAGS_Debug := \ -fstack-protector \ --param=ssp-buffer-size=4 \ - -Werror \ + \ -fno-strict-aliasing \ -Wall \ -Wno-unused-parameter \ @@ -156,7 +156,7 @@ LOCAL_CPPFLAGS_Debug := \ MY_CFLAGS_Release := \ -fstack-protector \ --param=ssp-buffer-size=4 \ - -Werror \ + \ -fno-strict-aliasing \ -Wall \ -Wno-unused-parameter \ -- cgit v1.2.3