| 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 688 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 699           'use_cairo%': 1, | 699           'use_cairo%': 1, | 
| 700         }], | 700         }], | 
| 701 | 701 | 
| 702         # DBus usage. | 702         # DBus usage. | 
| 703         ['OS=="linux" and embedded==0', { | 703         ['OS=="linux" and embedded==0', { | 
| 704           'use_dbus%': 1, | 704           'use_dbus%': 1, | 
| 705         }, { | 705         }, { | 
| 706           'use_dbus%': 0, | 706           'use_dbus%': 0, | 
| 707         }], | 707         }], | 
| 708 | 708 | 
|  | 709         # Libxkbcommon usage. | 
|  | 710         ['use_ozone==1 and embedded==0', { | 
|  | 711           'use_xkbcommon%': 1, | 
|  | 712         }, { | 
|  | 713           'use_xkbcommon%': 0, | 
|  | 714         }], | 
|  | 715 | 
| 709         # We always use skia text rendering in Aura on Windows, since GDI | 716         # We always use skia text rendering in Aura on Windows, since GDI | 
| 710         # doesn't agree with our BackingStore. | 717         # doesn't agree with our BackingStore. | 
| 711         # TODO(beng): remove once skia text rendering is on by default. | 718         # TODO(beng): remove once skia text rendering is on by default. | 
| 712         ['use_aura==1 and OS=="win"', { | 719         ['use_aura==1 and OS=="win"', { | 
| 713           'enable_skia_text%': 1, | 720           'enable_skia_text%': 1, | 
| 714         }], | 721         }], | 
| 715 | 722 | 
| 716         # A flag to enable or disable our compile-time dependency | 723         # A flag to enable or disable our compile-time dependency | 
| 717         # on gnome-keyring. If that dependency is disabled, no gnome-keyring | 724         # on gnome-keyring. If that dependency is disabled, no gnome-keyring | 
| 718         # support will be available. This option is useful | 725         # support will be available. This option is useful | 
| (...skipping 361 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 1080     'use_nss%': '<(use_nss)', | 1087     'use_nss%': '<(use_nss)', | 
| 1081     'use_udev%': '<(use_udev)', | 1088     'use_udev%': '<(use_udev)', | 
| 1082     'os_bsd%': '<(os_bsd)', | 1089     'os_bsd%': '<(os_bsd)', | 
| 1083     'os_posix%': '<(os_posix)', | 1090     'os_posix%': '<(os_posix)', | 
| 1084     'use_dbus%': '<(use_dbus)', | 1091     'use_dbus%': '<(use_dbus)', | 
| 1085     'use_glib%': '<(use_glib)', | 1092     'use_glib%': '<(use_glib)', | 
| 1086     'use_pango%': '<(use_pango)', | 1093     'use_pango%': '<(use_pango)', | 
| 1087     'use_cairo%': '<(use_cairo)', | 1094     'use_cairo%': '<(use_cairo)', | 
| 1088     'use_ozone%': '<(use_ozone)', | 1095     'use_ozone%': '<(use_ozone)', | 
| 1089     'use_ozone_evdev%': '<(use_ozone_evdev)', | 1096     'use_ozone_evdev%': '<(use_ozone_evdev)', | 
|  | 1097     'use_xkbcommon%': '<(use_xkbcommon)', | 
| 1090     'use_clipboard_aurax11%': '<(use_clipboard_aurax11)', | 1098     'use_clipboard_aurax11%': '<(use_clipboard_aurax11)', | 
| 1091     'desktop_linux%': '<(desktop_linux)', | 1099     'desktop_linux%': '<(desktop_linux)', | 
| 1092     'use_x11%': '<(use_x11)', | 1100     'use_x11%': '<(use_x11)', | 
| 1093     'use_gnome_keyring%': '<(use_gnome_keyring)', | 1101     'use_gnome_keyring%': '<(use_gnome_keyring)', | 
| 1094     'linux_fpic%': '<(linux_fpic)', | 1102     'linux_fpic%': '<(linux_fpic)', | 
| 1095     'chromeos%': '<(chromeos)', | 1103     'chromeos%': '<(chromeos)', | 
| 1096     'chromecast%': '<(chromecast)', | 1104     'chromecast%': '<(chromecast)', | 
| 1097     'enable_viewport%': '<(enable_viewport)', | 1105     'enable_viewport%': '<(enable_viewport)', | 
| 1098     'enable_hidpi%': '<(enable_hidpi)', | 1106     'enable_hidpi%': '<(enable_hidpi)', | 
| 1099     'image_loader_extension%': '<(image_loader_extension)', | 1107     'image_loader_extension%': '<(image_loader_extension)', | 
| (...skipping 4738 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 5838     # settings in target dicts.  SYMROOT is a special case, because many other | 5846     # settings in target dicts.  SYMROOT is a special case, because many other | 
| 5839     # Xcode variables depend on it, including variables such as | 5847     # Xcode variables depend on it, including variables such as | 
| 5840     # PROJECT_DERIVED_FILE_DIR.  When a source group corresponding to something | 5848     # PROJECT_DERIVED_FILE_DIR.  When a source group corresponding to something | 
| 5841     # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 5849     # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 
| 5842     # files to appear (when present) in the UI as actual files and not red | 5850     # files to appear (when present) in the UI as actual files and not red | 
| 5843     # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 5851     # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 
| 5844     # and therefore SYMROOT, needs to be set at the project level. | 5852     # and therefore SYMROOT, needs to be set at the project level. | 
| 5845     'SYMROOT': '<(DEPTH)/xcodebuild', | 5853     'SYMROOT': '<(DEPTH)/xcodebuild', | 
| 5846   }, | 5854   }, | 
| 5847 } | 5855 } | 
| OLD | NEW | 
|---|