OLD | NEW |
1 # Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2011 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 expected to be overriden on the GYP command line (-D) or by | 9 # Variables expected to be overriden on the GYP command line (-D) or by |
10 # ~/.gyp/include.gypi. | 10 # ~/.gyp/include.gypi. |
(...skipping 1345 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1356 ], | 1356 ], |
1357 }]], | 1357 }]], |
1358 }], | 1358 }], |
1359 ['clang==1 and chromeos==1', { | 1359 ['clang==1 and chromeos==1', { |
1360 'target_conditions': [ | 1360 'target_conditions': [ |
1361 ['_toolset=="target"', { | 1361 ['_toolset=="target"', { |
1362 'cflags': [ | 1362 'cflags': [ |
1363 # TODO(thakis): Remove this once all instances of this | 1363 # TODO(thakis): Remove this once all instances of this |
1364 # are fixed in the views and chromeos code. | 1364 # are fixed in the views and chromeos code. |
1365 # http://crbug.com/84424 | 1365 # http://crbug.com/84424 |
1366 '-Wno-delete-non-virtual-dtor', | 1366 # TODO(thakis): Add back in when rolling clang past r131989 |
| 1367 #'-Wno-delete-non-virtual-dtor', |
1367 ], | 1368 ], |
1368 }]], | 1369 }]], |
1369 }], | 1370 }], |
1370 ['clang==1 and clang_use_chrome_plugins==1', { | 1371 ['clang==1 and clang_use_chrome_plugins==1', { |
1371 'target_conditions': [ | 1372 'target_conditions': [ |
1372 ['_toolset=="target"', { | 1373 ['_toolset=="target"', { |
1373 'cflags': [ | 1374 'cflags': [ |
1374 '<(clang_chrome_plugins_flags)', | 1375 '<(clang_chrome_plugins_flags)', |
1375 ], | 1376 ], |
1376 }]], | 1377 }]], |
(...skipping 398 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1775 # and therefore SYMROOT, needs to be set at the project level. | 1776 # and therefore SYMROOT, needs to be set at the project level. |
1776 'SYMROOT': '<(DEPTH)/xcodebuild', | 1777 'SYMROOT': '<(DEPTH)/xcodebuild', |
1777 }, | 1778 }, |
1778 } | 1779 } |
1779 | 1780 |
1780 # Local Variables: | 1781 # Local Variables: |
1781 # tab-width:2 | 1782 # tab-width:2 |
1782 # indent-tabs-mode:nil | 1783 # indent-tabs-mode:nil |
1783 # End: | 1784 # End: |
1784 # vim: set expandtab tabstop=2 shiftwidth=2: | 1785 # vim: set expandtab tabstop=2 shiftwidth=2: |
OLD | NEW |