| OLD | NEW |
| 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2012 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 1514 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1525 ['use_concatenated_impulse_responses==1', { | 1525 ['use_concatenated_impulse_responses==1', { |
| 1526 'grit_defines': ['-D', 'use_concatenated_impulse_responses'], | 1526 'grit_defines': ['-D', 'use_concatenated_impulse_responses'], |
| 1527 }], | 1527 }], |
| 1528 ['clang_use_chrome_plugins==1 and OS!="win"', { | 1528 ['clang_use_chrome_plugins==1 and OS!="win"', { |
| 1529 'variables': { | 1529 'variables': { |
| 1530 'clang_chrome_plugins_flags': [ | 1530 'clang_chrome_plugins_flags': [ |
| 1531 '<!@(<(DEPTH)/tools/clang/scripts/plugin_flags.sh)' | 1531 '<!@(<(DEPTH)/tools/clang/scripts/plugin_flags.sh)' |
| 1532 ], | 1532 ], |
| 1533 }, | 1533 }, |
| 1534 'conditions': [ | 1534 'conditions': [ |
| 1535 ['OS=="linux" and chromeos==0', { | 1535 ['OS=="linux" and chromeos==0 and use_aura==0', { |
| 1536 'clang_chrome_plugins_flags': [ | 1536 'clang_chrome_plugins_flags': [ |
| 1537 '<@(clang_chrome_plugins_flags)' | 1537 '<@(clang_chrome_plugins_flags)' |
| 1538 ], | 1538 ], |
| 1539 }, { | 1539 }, { |
| 1540 # TODO(rsleevi): http://crbug.com/115047 - This warning is only | 1540 # TODO(rsleevi): http://crbug.com/115047 - This warning is only |
| 1541 # enabled for Linux for now. Disable everywhere else. | 1541 # enabled for Linux for now. Disable everywhere else. |
| 1542 'clang_chrome_plugins_flags': [ | 1542 'clang_chrome_plugins_flags': [ |
| 1543 '<@(clang_chrome_plugins_flags)', | 1543 '<@(clang_chrome_plugins_flags)', |
| 1544 '-Xclang', | 1544 '-Xclang', |
| 1545 '-plugin-arg-find-bad-constructs', | 1545 '-plugin-arg-find-bad-constructs', |
| (...skipping 2873 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4419 # settings in target dicts. SYMROOT is a special case, because many other | 4419 # settings in target dicts. SYMROOT is a special case, because many other |
| 4420 # Xcode variables depend on it, including variables such as | 4420 # Xcode variables depend on it, including variables such as |
| 4421 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 4421 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
| 4422 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 4422 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
| 4423 # files to appear (when present) in the UI as actual files and not red | 4423 # files to appear (when present) in the UI as actual files and not red |
| 4424 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 4424 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 4425 # and therefore SYMROOT, needs to be set at the project level. | 4425 # and therefore SYMROOT, needs to be set at the project level. |
| 4426 'SYMROOT': '<(DEPTH)/xcodebuild', | 4426 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 4427 }, | 4427 }, |
| 4428 } | 4428 } |
| OLD | NEW |