summaryrefslogtreecommitdiffstats
path: root/build/common.gypi
diff options
context:
space:
mode:
authorthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-24 05:57:53 +0000
committerthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-24 05:57:53 +0000
commit8f7764712576decf782402d45642da5e8be4879a (patch)
treed0d7ac560920fc6303dd3e4c31979b8adc580284 /build/common.gypi
parentb5063f2cc6cd99d5d3da2e19dff9524c8117df3d (diff)
downloadchromium_src-8f7764712576decf782402d45642da5e8be4879a.zip
chromium_src-8f7764712576decf782402d45642da5e8be4879a.tar.gz
chromium_src-8f7764712576decf782402d45642da5e8be4879a.tar.bz2
roll clang 151385:153254
New stuff: * ObjC number, array, dict literals * ASan fixes, visibility fixes (see bugs) * (c++11: User-defined literals) * -Wstring-plus-int * Fix for a bug that made the last roll not work with goma BUG=114996,112539,119119 TEST=none Review URL: http://codereview.chromium.org/9836038 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@128696 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/common.gypi')
-rw-r--r--build/common.gypi8
1 files changed, 8 insertions, 0 deletions
diff --git a/build/common.gypi b/build/common.gypi
index c90d15b..9187f89 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -2052,6 +2052,10 @@
# Invalid() in gmocks's gmock-internal-utils.h
# http://crbug.com/111806
'-Wno-null-dereference',
+
+ # TODO(thakis): Investigate if it's worth cleaning up the code
+ # and turning this on.
+ '-Wno-null-conversion',
],
'cflags!': [
# Clang doesn't seem to know know this flag.
@@ -2471,6 +2475,10 @@
# Invalid() in gmock's gmock-internal-utils.h
# http://crbug.com/111806
'-Wno-null-dereference',
+
+ # TODO(thakis): Investigate if it's worth cleaning up the code
+ # and turning this on.
+ '-Wno-null-conversion',
],
}],
['clang==1 and clang_use_chrome_plugins==1', {