Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(287)

Side by Side Diff: build/common.gypi

Issue 3705002: Roll gtest 445 -> 446 (Closed)
Patch Set: clang Created 10 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « DEPS ('k') | chrome_frame/test/exception_barrier_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2010 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 # IMPORTANT: 5 # IMPORTANT:
6 # Please don't directly include this file if you are building via gyp_chromium, 6 # Please don't directly include this file if you are building via gyp_chromium,
7 # since gyp_chromium is automatically forcing its inclusion. 7 # since gyp_chromium is automatically forcing its inclusion.
8 { 8 {
9 'variables': { 9 'variables': {
10 # .gyp files or targets should set chromium_code to 1 if they build 10 # .gyp files or targets should set chromium_code to 1 if they build
(...skipping 1125 matching lines...) Expand 10 before | Expand all | Expand 10 after
1136 'cflags': [ 1136 'cflags': [
1137 # Don't warn about unused variables, due to a common pattern: 1137 # Don't warn about unused variables, due to a common pattern:
1138 # scoped_deleter unused_variable(&thing_to_delete); 1138 # scoped_deleter unused_variable(&thing_to_delete);
1139 '-Wno-unused-variable', 1139 '-Wno-unused-variable',
1140 # Clang spots more unused functions. 1140 # Clang spots more unused functions.
1141 '-Wno-unused-function', 1141 '-Wno-unused-function',
1142 # gtest confuses clang. 1142 # gtest confuses clang.
1143 '-Wno-bool-conversions', 1143 '-Wno-bool-conversions',
1144 # Don't die on dtoa code that uses a char as an array index. 1144 # Don't die on dtoa code that uses a char as an array index.
1145 '-Wno-char-subscripts', 1145 '-Wno-char-subscripts',
1146 # Survive EXPECT_EQ(unnamed_enum, unsigned int) -- see
1147 # http://code.google.com/p/googletest/source/detail?r=446 .
1148 # TODO(thakis): Use -isystem instead (http://crbug.com/58751 ).
1149 '-Wno-unnamed-type-template-args',
1146 ], 1150 ],
1147 'cflags!': [ 1151 'cflags!': [
1148 # Clang doesn't seem to know know this flag. 1152 # Clang doesn't seem to know know this flag.
1149 '-mfpmath=sse', 1153 '-mfpmath=sse',
1150 ], 1154 ],
1151 }], 1155 }],
1152 ['no_strict_aliasing==1', { 1156 ['no_strict_aliasing==1', {
1153 'cflags': [ 1157 'cflags': [
1154 '-fno-strict-aliasing', 1158 '-fno-strict-aliasing',
1155 ], 1159 ],
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
1244 ], 1248 ],
1245 'conditions': [ 1249 'conditions': [
1246 ['chromium_mac_pch', {'GCC_PRECOMPILE_PREFIX_HEADER': 'YES'}, 1250 ['chromium_mac_pch', {'GCC_PRECOMPILE_PREFIX_HEADER': 'YES'},
1247 {'GCC_PRECOMPILE_PREFIX_HEADER': 'NO'} 1251 {'GCC_PRECOMPILE_PREFIX_HEADER': 'NO'}
1248 ], 1252 ],
1249 ['clang==1', { 1253 ['clang==1', {
1250 'WARNING_CFLAGS': [ 1254 'WARNING_CFLAGS': [
1251 # Don't die on dtoa code that uses a char as an array index. 1255 # Don't die on dtoa code that uses a char as an array index.
1252 # This is required solely for base/third_party/dmg_fp/dtoa.cc. 1256 # This is required solely for base/third_party/dmg_fp/dtoa.cc.
1253 '-Wno-char-subscripts', 1257 '-Wno-char-subscripts',
1258 # Survive EXPECT_EQ(unnamed_enum, unsigned int) -- see
1259 # http://code.google.com/p/googletest/source/detail?r=446 .
1260 # TODO(thakis): Use -isystem instead (http://crbug.com/58751 ).
1261 '-Wno-unnamed-type-template-args',
1254 ], 1262 ],
1255 }], 1263 }],
1256 ], 1264 ],
1257 }, 1265 },
1258 'target_conditions': [ 1266 'target_conditions': [
1259 ['_type!="static_library"', { 1267 ['_type!="static_library"', {
1260 'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-search_paths_first']}, 1268 'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-search_paths_first']},
1261 }], 1269 }],
1262 ['_mac_bundle', { 1270 ['_mac_bundle', {
1263 'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']}, 1271 'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']},
(...skipping 234 matching lines...) Expand 10 before | Expand all | Expand 10 after
1498 # and therefore SYMROOT, needs to be set at the project level. 1506 # and therefore SYMROOT, needs to be set at the project level.
1499 'SYMROOT': '<(DEPTH)/xcodebuild', 1507 'SYMROOT': '<(DEPTH)/xcodebuild',
1500 }, 1508 },
1501 } 1509 }
1502 1510
1503 # Local Variables: 1511 # Local Variables:
1504 # tab-width:2 1512 # tab-width:2
1505 # indent-tabs-mode:nil 1513 # indent-tabs-mode:nil
1506 # End: 1514 # End:
1507 # vim: set expandtab tabstop=2 shiftwidth=2: 1515 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « DEPS ('k') | chrome_frame/test/exception_barrier_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698