| 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 233 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|   244       # thread. Set to 1 to turn on experimental support for out-of-process |   244       # thread. Set to 1 to turn on experimental support for out-of-process | 
|   245       # plugins to make call of the main thread. |   245       # plugins to make call of the main thread. | 
|   246       'enable_pepper_threading%': 0, |   246       'enable_pepper_threading%': 0, | 
|   247  |   247  | 
|   248       # XInput2 multitouch support is disabled by default (use_xi2_mt=0). |   248       # XInput2 multitouch support is disabled by default (use_xi2_mt=0). | 
|   249       # Setting to non-zero value enables XI2 MT. When XI2 MT is enabled, |   249       # Setting to non-zero value enables XI2 MT. When XI2 MT is enabled, | 
|   250       # the input value also defines the required XI2 minor minimum version. |   250       # the input value also defines the required XI2 minor minimum version. | 
|   251       # For example, use_xi2_mt=2 means XI2.2 or above version is required. |   251       # For example, use_xi2_mt=2 means XI2.2 or above version is required. | 
|   252       'use_xi2_mt%': 0, |   252       'use_xi2_mt%': 0, | 
|   253  |   253  | 
|   254       # Use of precompiled headers on Windows is off by default |   254       # Use of precompiled headers on Windows. | 
|   255       # because of complications that it can cause with our |   255       # | 
|   256       # infrastructure (trybots etc.).  Enable by setting to 1 in |   256       # This is on by default in VS 2010, but off by default for VS | 
|   257       # ~/.gyp/include.gypi or via the GYP command line for ~20-25% |   257       # 2008 because of complications that it can cause with our | 
|   258       # faster builds. |   258       # trybots etc. | 
 |   259       # | 
 |   260       # This variable may be explicitly set to 1 (enabled) or 0 | 
 |   261       # (disabled) in ~/.gyp/include.gypi or via the GYP command line. | 
 |   262       # This setting will override the default. | 
 |   263       # | 
 |   264       # Note that a setting of 1 is probably suitable for most or all | 
 |   265       # Windows developers using VS 2008, since precompiled headers | 
 |   266       # provide a build speedup of 20-25%.  There are a couple of | 
 |   267       # small workarounds you may need to use when using VS 2008 (but | 
 |   268       # not 2010), see | 
 |   269       # http://code.google.com/p/chromium/wiki/WindowsPrecompiledHeaders | 
 |   270       # for details. | 
|   259       'chromium_win_pch%': 0, |   271       'chromium_win_pch%': 0, | 
|   260  |   272  | 
|   261       'conditions': [ |   273       'conditions': [ | 
|   262         # TODO(epoger): Figure out how to set use_skia=1 for Mac outside of |   274         # TODO(epoger): Figure out how to set use_skia=1 for Mac outside of | 
|   263         # the 'conditions' clause.  Initial attempts resulted in chromium and |   275         # the 'conditions' clause.  Initial attempts resulted in chromium and | 
|   264         # webkit disagreeing on its setting. |   276         # webkit disagreeing on its setting. | 
|   265         ['OS=="mac"', { |   277         ['OS=="mac"', { | 
|   266           'use_skia%': '<(use_skia_on_mac)', |   278           'use_skia%': '<(use_skia_on_mac)', | 
|   267           # Mac uses clang by default, so turn on the plugin as well. |   279           # Mac uses clang by default, so turn on the plugin as well. | 
|   268           'clang_use_chrome_plugins%': 1, |   280           'clang_use_chrome_plugins%': 1, | 
| (...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|   358           'enable_webrtc%': 0, |   370           'enable_webrtc%': 0, | 
|   359         }], |   371         }], | 
|   360  |   372  | 
|   361         # Use GPU accelerated cross process image transport by default |   373         # Use GPU accelerated cross process image transport by default | 
|   362         # on linux builds with the Aura window manager |   374         # on linux builds with the Aura window manager | 
|   363         ['views_compositor==1 and OS=="linux"', { |   375         ['views_compositor==1 and OS=="linux"', { | 
|   364           'ui_compositor_image_transport%': 1, |   376           'ui_compositor_image_transport%': 1, | 
|   365         }, { |   377         }, { | 
|   366           'ui_compositor_image_transport%': 0, |   378           'ui_compositor_image_transport%': 0, | 
|   367         }], |   379         }], | 
 |   380  | 
 |   381         # Turn precompiled headers on by default for VS 2010. | 
 |   382         ['OS=="win" and MSVS_VERSION=="2010"', { | 
 |   383           'chromium_win_pch%': 1 | 
 |   384         }], | 
|   368       ], |   385       ], | 
|   369     }, |   386     }, | 
|   370  |   387  | 
|   371     # Copy conditionally-set variables out one scope. |   388     # Copy conditionally-set variables out one scope. | 
|   372     'branding%': '<(branding)', |   389     'branding%': '<(branding)', | 
|   373     'buildtype%': '<(buildtype)', |   390     'buildtype%': '<(buildtype)', | 
|   374     'target_arch%': '<(target_arch)', |   391     'target_arch%': '<(target_arch)', | 
|   375     'host_arch%': '<(host_arch)', |   392     'host_arch%': '<(host_arch)', | 
|   376     'library%': 'static_library', |   393     'library%': 'static_library', | 
|   377     'aura_show_about_flag_window_mode%': '<(aura_show_about_flag_window_mode)', |   394     'aura_show_about_flag_window_mode%': '<(aura_show_about_flag_window_mode)', | 
| (...skipping 2423 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  2801     # settings in target dicts.  SYMROOT is a special case, because many other |  2818     # settings in target dicts.  SYMROOT is a special case, because many other | 
|  2802     # Xcode variables depend on it, including variables such as |  2819     # Xcode variables depend on it, including variables such as | 
|  2803     # PROJECT_DERIVED_FILE_DIR.  When a source group corresponding to something |  2820     # PROJECT_DERIVED_FILE_DIR.  When a source group corresponding to something | 
|  2804     # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |  2821     # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 
|  2805     # files to appear (when present) in the UI as actual files and not red |  2822     # files to appear (when present) in the UI as actual files and not red | 
|  2806     # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |  2823     # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 
|  2807     # and therefore SYMROOT, needs to be set at the project level. |  2824     # and therefore SYMROOT, needs to be set at the project level. | 
|  2808     'SYMROOT': '<(DEPTH)/xcodebuild', |  2825     'SYMROOT': '<(DEPTH)/xcodebuild', | 
|  2809   }, |  2826   }, | 
|  2810 } |  2827 } | 
| OLD | NEW |