diff options
author | Torne (Richard Coles) <torne@google.com> | 2014-12-05 12:29:01 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-12-05 12:29:02 +0000 |
commit | 686b636e75103f021567ec9c900b977a91a82d95 (patch) | |
tree | 6a3d89e0adf004a99d84798826eecabd0b6462ff | |
parent | 6c1182f864acaa8046170b25f3337b5168f2217e (diff) | |
parent | c16ca2fe0309277c39a3407c73418802e48cdb14 (diff) | |
download | ots-686b636e75103f021567ec9c900b977a91a82d95.tar.gz |
Merge "Temporarily disable -Werror in Chromium."android-m-previewmaster-soong
-rw-r--r-- | ots.target.darwin-arm.mk | 4 | ||||
-rw-r--r-- | ots.target.darwin-arm64.mk | 4 | ||||
-rw-r--r-- | ots.target.darwin-x86.mk | 4 | ||||
-rw-r--r-- | ots.target.darwin-x86_64.mk | 4 | ||||
-rw-r--r-- | ots.target.linux-arm.mk | 4 | ||||
-rw-r--r-- | ots.target.linux-arm64.mk | 4 | ||||
-rw-r--r-- | ots.target.linux-x86.mk | 4 | ||||
-rw-r--r-- | 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 \ |