| 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 829 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 840 | 840 |
| 841 # Enable autofill dialog when not on iOS. | 841 # Enable autofill dialog when not on iOS. |
| 842 ['OS!="ios"', { | 842 ['OS!="ios"', { |
| 843 'enable_autofill_dialog%': 1, | 843 'enable_autofill_dialog%': 1, |
| 844 }], | 844 }], |
| 845 | 845 |
| 846 ['buildtype=="Official"', { | 846 ['buildtype=="Official"', { |
| 847 'enable_prod_wallet_service%': 1, | 847 'enable_prod_wallet_service%': 1, |
| 848 }], | 848 }], |
| 849 | 849 |
| 850 # Enable Control Flow Integrity for the official Linux Chrome. |
| 851 # This triggers an LTO build that requires LLVM Gold plugin to be |
| 852 # downloaded. See src/tools/clang/scripts/update.sh |
| 853 ['OS=="linux" and target_arch=="x64" and buildtype=="Official" and brand
ing=="Chrome" and chromeos==0', { |
| 854 'cfi_vptr%': 1, |
| 855 }], |
| 856 |
| 850 # Enable hotwording on Chrome-branded ChromeOS builds. | 857 # Enable hotwording on Chrome-branded ChromeOS builds. |
| 851 ['branding=="Chrome" and chromeos==1', { | 858 ['branding=="Chrome" and chromeos==1', { |
| 852 'enable_hotwording%': 1, | 859 'enable_hotwording%': 1, |
| 853 }], | 860 }], |
| 854 | 861 |
| 855 ['OS=="android"', { | 862 ['OS=="android"', { |
| 856 'enable_webrtc%': 1, | 863 'enable_webrtc%': 1, |
| 857 }], | 864 }], |
| 858 | 865 |
| 859 ['OS=="ios"', { | 866 ['OS=="ios"', { |
| (...skipping 5511 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 6371 # settings in target dicts. SYMROOT is a special case, because many other | 6378 # settings in target dicts. SYMROOT is a special case, because many other |
| 6372 # Xcode variables depend on it, including variables such as | 6379 # Xcode variables depend on it, including variables such as |
| 6373 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 6380 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
| 6374 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 6381 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
| 6375 # files to appear (when present) in the UI as actual files and not red | 6382 # files to appear (when present) in the UI as actual files and not red |
| 6376 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 6383 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 6377 # and therefore SYMROOT, needs to be set at the project level. | 6384 # and therefore SYMROOT, needs to be set at the project level. |
| 6378 'SYMROOT': '<(DEPTH)/xcodebuild', | 6385 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 6379 }, | 6386 }, |
| 6380 } | 6387 } |
| OLD | NEW |