| 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 690 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 701       # which would lead to all code be optimized with -O2. See crbug.com/407544 | 701       # which would lead to all code be optimized with -O2. See crbug.com/407544 | 
| 702       'use_lto%': 0, | 702       'use_lto%': 0, | 
| 703       'use_lto_o2%': 0, | 703       'use_lto_o2%': 0, | 
| 704 | 704 | 
| 705       # Allowed level of identical code folding in the gold linker. | 705       # Allowed level of identical code folding in the gold linker. | 
| 706       'gold_icf_level%': 'all', | 706       'gold_icf_level%': 'all', | 
| 707 | 707 | 
| 708       # Libxkbcommon usage. | 708       # Libxkbcommon usage. | 
| 709       'use_xkbcommon%': 0, | 709       'use_xkbcommon%': 0, | 
| 710 | 710 | 
|  | 711       # Whether we use GTKv3 on linux. | 
|  | 712       'use_gtk3%': 0, | 
|  | 713 | 
| 711       # Control Flow Integrity for virtual calls and casts. | 714       # Control Flow Integrity for virtual calls and casts. | 
| 712       # See http://clang.llvm.org/docs/ControlFlowIntegrity.html | 715       # See http://clang.llvm.org/docs/ControlFlowIntegrity.html | 
| 713       'cfi_vptr%': 0, | 716       'cfi_vptr%': 0, | 
| 714       'cfi_diag%': 0, | 717       'cfi_diag%': 0, | 
| 715 | 718 | 
| 716       'cfi_blacklist%': '<(PRODUCT_DIR)/../../tools/cfi/blacklist.txt', | 719       'cfi_blacklist%': '<(PRODUCT_DIR)/../../tools/cfi/blacklist.txt', | 
| 717 | 720 | 
| 718       # Whether the entire browser uses toolkit-views on Mac instead of Cocoa. | 721       # Whether the entire browser uses toolkit-views on Mac instead of Cocoa. | 
| 719       'mac_views_browser%': 0, | 722       'mac_views_browser%': 0, | 
| 720 | 723 | 
| (...skipping 404 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 1125     'use_udev%': '<(use_udev)', | 1128     'use_udev%': '<(use_udev)', | 
| 1126     'os_bsd%': '<(os_bsd)', | 1129     'os_bsd%': '<(os_bsd)', | 
| 1127     'os_posix%': '<(os_posix)', | 1130     'os_posix%': '<(os_posix)', | 
| 1128     'use_dbus%': '<(use_dbus)', | 1131     'use_dbus%': '<(use_dbus)', | 
| 1129     'use_glib%': '<(use_glib)', | 1132     'use_glib%': '<(use_glib)', | 
| 1130     'use_pango%': '<(use_pango)', | 1133     'use_pango%': '<(use_pango)', | 
| 1131     'use_cairo%': '<(use_cairo)', | 1134     'use_cairo%': '<(use_cairo)', | 
| 1132     'use_ozone%': '<(use_ozone)', | 1135     'use_ozone%': '<(use_ozone)', | 
| 1133     'use_ozone_evdev%': '<(use_ozone_evdev)', | 1136     'use_ozone_evdev%': '<(use_ozone_evdev)', | 
| 1134     'use_xkbcommon%': '<(use_xkbcommon)', | 1137     'use_xkbcommon%': '<(use_xkbcommon)', | 
|  | 1138     'use_gtk3%': '<(use_gtk3)', | 
| 1135     'use_clipboard_aurax11%': '<(use_clipboard_aurax11)', | 1139     'use_clipboard_aurax11%': '<(use_clipboard_aurax11)', | 
| 1136     'desktop_linux%': '<(desktop_linux)', | 1140     'desktop_linux%': '<(desktop_linux)', | 
| 1137     'use_x11%': '<(use_x11)', | 1141     'use_x11%': '<(use_x11)', | 
| 1138     'use_gnome_keyring%': '<(use_gnome_keyring)', | 1142     'use_gnome_keyring%': '<(use_gnome_keyring)', | 
| 1139     'linux_fpic%': '<(linux_fpic)', | 1143     'linux_fpic%': '<(linux_fpic)', | 
| 1140     'chromeos%': '<(chromeos)', | 1144     'chromeos%': '<(chromeos)', | 
| 1141     'chromecast%': '<(chromecast)', | 1145     'chromecast%': '<(chromecast)', | 
| 1142     'enable_viewport%': '<(enable_viewport)', | 1146     'enable_viewport%': '<(enable_viewport)', | 
| 1143     'enable_hidpi%': '<(enable_hidpi)', | 1147     'enable_hidpi%': '<(enable_hidpi)', | 
| 1144     'enable_topchrome_md%': '<(enable_topchrome_md)', | 1148     'enable_topchrome_md%': '<(enable_topchrome_md)', | 
| (...skipping 5176 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 6321     # settings in target dicts.  SYMROOT is a special case, because many other | 6325     # settings in target dicts.  SYMROOT is a special case, because many other | 
| 6322     # Xcode variables depend on it, including variables such as | 6326     # Xcode variables depend on it, including variables such as | 
| 6323     # PROJECT_DERIVED_FILE_DIR.  When a source group corresponding to something | 6327     # PROJECT_DERIVED_FILE_DIR.  When a source group corresponding to something | 
| 6324     # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 6328     # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 
| 6325     # files to appear (when present) in the UI as actual files and not red | 6329     # files to appear (when present) in the UI as actual files and not red | 
| 6326     # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 6330     # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 
| 6327     # and therefore SYMROOT, needs to be set at the project level. | 6331     # and therefore SYMROOT, needs to be set at the project level. | 
| 6328     'SYMROOT': '<(DEPTH)/xcodebuild', | 6332     'SYMROOT': '<(DEPTH)/xcodebuild', | 
| 6329   }, | 6333   }, | 
| 6330 } | 6334 } | 
| OLD | NEW | 
|---|