| 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 2451 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2462 # Clang considers the `register` keyword as deprecated, but e.g. | 2462 # Clang considers the `register` keyword as deprecated, but e.g. |
| 2463 # code generated by flex (used in angle) contains that keyword. | 2463 # code generated by flex (used in angle) contains that keyword. |
| 2464 # http://crbug.com/255186 | 2464 # http://crbug.com/255186 |
| 2465 '-Wno-deprecated-register', | 2465 '-Wno-deprecated-register', |
| 2466 ], | 2466 ], |
| 2467 }, | 2467 }, |
| 2468 'includes': [ 'set_clang_warning_flags.gypi', ], | 2468 'includes': [ 'set_clang_warning_flags.gypi', ], |
| 2469 'defines': [ | 2469 'defines': [ |
| 2470 # Don't use deprecated V8 APIs anywhere. | 2470 # Don't use deprecated V8 APIs anywhere. |
| 2471 'V8_DEPRECATION_WARNINGS', | 2471 'V8_DEPRECATION_WARNINGS', |
| 2472 # Temporary suppression until Blink code can be removed. | |
| 2473 'BLINK_SCALE_FILTERS_AT_RECORD_TIME', | |
| 2474 ], | 2472 ], |
| 2475 'include_dirs': [ | 2473 'include_dirs': [ |
| 2476 '<(SHARED_INTERMEDIATE_DIR)', | 2474 '<(SHARED_INTERMEDIATE_DIR)', |
| 2477 ], | 2475 ], |
| 2478 'conditions': [ | 2476 'conditions': [ |
| 2479 ['(OS=="mac" or OS=="ios") and asan==1', { | 2477 ['(OS=="mac" or OS=="ios") and asan==1', { |
| 2480 'dependencies': [ | 2478 'dependencies': [ |
| 2481 '<(DEPTH)/build/mac/asan.gyp:asan_dynamic_runtime', | 2479 '<(DEPTH)/build/mac/asan.gyp:asan_dynamic_runtime', |
| 2482 ], | 2480 ], |
| 2483 }], | 2481 }], |
| (...skipping 3196 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5680 # settings in target dicts. SYMROOT is a special case, because many other | 5678 # settings in target dicts. SYMROOT is a special case, because many other |
| 5681 # Xcode variables depend on it, including variables such as | 5679 # Xcode variables depend on it, including variables such as |
| 5682 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 5680 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
| 5683 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 5681 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
| 5684 # files to appear (when present) in the UI as actual files and not red | 5682 # files to appear (when present) in the UI as actual files and not red |
| 5685 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 5683 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 5686 # and therefore SYMROOT, needs to be set at the project level. | 5684 # and therefore SYMROOT, needs to be set at the project level. |
| 5687 'SYMROOT': '<(DEPTH)/xcodebuild', | 5685 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 5688 }, | 5686 }, |
| 5689 } | 5687 } |
| OLD | NEW |