| 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 2505 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2516 # TODO(thakis): Remove this. | 2516 # TODO(thakis): Remove this. |
| 2517 '-Wno-implicit-conversion-floating-point-to-bool', | 2517 '-Wno-implicit-conversion-floating-point-to-bool', |
| 2518 # TODO(thakis): Remove this once http://crbug.com/151927 is fixed. | 2518 # TODO(thakis): Remove this once http://crbug.com/151927 is fixed. |
| 2519 '-Wno-tautological-constant-out-of-range-compare', | 2519 '-Wno-tautological-constant-out-of-range-compare', |
| 2520 ], | 2520 ], |
| 2521 'cflags!': [ | 2521 'cflags!': [ |
| 2522 # Clang doesn't seem to know know this flag. | 2522 # Clang doesn't seem to know know this flag. |
| 2523 '-mfpmath=sse', | 2523 '-mfpmath=sse', |
| 2524 ], | 2524 ], |
| 2525 }], | 2525 }], |
| 2526 ['OS=="android"', { |
| 2527 'cflags!': [ |
| 2528 # Clang ARM does not support the following option. |
| 2529 # TODO: Add this flag back http://crbug.com/157195. |
| 2530 '-Wno-tautological-constant-out-of-range-compare', |
| 2531 ] |
| 2532 }], |
| 2526 ['clang==1 and clang_use_chrome_plugins==1', { | 2533 ['clang==1 and clang_use_chrome_plugins==1', { |
| 2527 'cflags': [ | 2534 'cflags': [ |
| 2528 '<@(clang_chrome_plugins_flags)', | 2535 '<@(clang_chrome_plugins_flags)', |
| 2529 ], | 2536 ], |
| 2530 }], | 2537 }], |
| 2531 ['clang==1 and clang_load!=""', { | 2538 ['clang==1 and clang_load!=""', { |
| 2532 'cflags': [ | 2539 'cflags': [ |
| 2533 '-Xclang', '-load', '-Xclang', '<(clang_load)', | 2540 '-Xclang', '-load', '-Xclang', '<(clang_load)', |
| 2534 ], | 2541 ], |
| 2535 }], | 2542 }], |
| (...skipping 1131 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3667 # settings in target dicts. SYMROOT is a special case, because many other | 3674 # settings in target dicts. SYMROOT is a special case, because many other |
| 3668 # Xcode variables depend on it, including variables such as | 3675 # Xcode variables depend on it, including variables such as |
| 3669 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 3676 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
| 3670 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 3677 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
| 3671 # files to appear (when present) in the UI as actual files and not red | 3678 # files to appear (when present) in the UI as actual files and not red |
| 3672 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 3679 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 3673 # and therefore SYMROOT, needs to be set at the project level. | 3680 # and therefore SYMROOT, needs to be set at the project level. |
| 3674 'SYMROOT': '<(DEPTH)/xcodebuild', | 3681 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 3675 }, | 3682 }, |
| 3676 } | 3683 } |
| OLD | NEW |