Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(242)

Side by Side Diff: build/common.gypi

Issue 8016008: Make much of the proxy thread-safe with 1 great big lock. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge Created 9 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | ppapi/ppapi_shared.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2011 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 203 matching lines...) Expand 10 before | Expand all | Expand 10 after
214 214
215 # Enable navigator.registerProtocolHandler and supporting UI. 215 # Enable navigator.registerProtocolHandler and supporting UI.
216 'enable_register_protocol_handler%': 1, 216 'enable_register_protocol_handler%': 1,
217 217
218 # Enable Web Intents and supporting UI. 218 # Enable Web Intents and supporting UI.
219 'enable_web_intents%': 0, 219 'enable_web_intents%': 0,
220 220
221 # Webrtc compilation is enabled by default. Set to 0 to disable. 221 # Webrtc compilation is enabled by default. Set to 0 to disable.
222 'enable_webrtc%': 1, 222 'enable_webrtc%': 1,
223 223
224 # PPAPI by default does not support plugins making calls off the main
225 # thread. Set to 1 to turn on experimental support for out-of-process
226 # plugins to make call of the main thread.
227 'enable_pepper_threading%': 0,
228
224 # XInput2 multitouch support is disabled by default (use_xi2_mt=0). 229 # XInput2 multitouch support is disabled by default (use_xi2_mt=0).
225 # Setting to non-zero value enables XI2 MT. When XI2 MT is enabled, 230 # Setting to non-zero value enables XI2 MT. When XI2 MT is enabled,
226 # the input value also defines the required XI2 minor minimum version. 231 # the input value also defines the required XI2 minor minimum version.
227 # For example, use_xi2_mt=2 means XI2.2 or above version is required. 232 # For example, use_xi2_mt=2 means XI2.2 or above version is required.
228 'use_xi2_mt%': 0, 233 'use_xi2_mt%': 0,
229 234
230 # Use of precompiled headers on Windows is off by default 235 # Use of precompiled headers on Windows is off by default
231 # because of complications that it can cause with our 236 # because of complications that it can cause with our
232 # infrastructure (trybots etc.). Enable by setting to 1 in 237 # infrastructure (trybots etc.). Enable by setting to 1 in
233 # ~/.gyp/include.gypi or via the GYP command line for ~20-25% 238 # ~/.gyp/include.gypi or via the GYP command line for ~20-25%
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
338 'use_openssl%': '<(use_openssl)', 343 'use_openssl%': '<(use_openssl)',
339 'use_nss%': '<(use_nss)', 344 'use_nss%': '<(use_nss)',
340 'os_posix%': '<(os_posix)', 345 'os_posix%': '<(os_posix)',
341 'use_glib%': '<(use_glib)', 346 'use_glib%': '<(use_glib)',
342 'toolkit_uses_gtk%': '<(toolkit_uses_gtk)', 347 'toolkit_uses_gtk%': '<(toolkit_uses_gtk)',
343 'use_skia%': '<(use_skia)', 348 'use_skia%': '<(use_skia)',
344 'use_x11%': '<(use_x11)', 349 'use_x11%': '<(use_x11)',
345 'use_gnome_keyring%': '<(use_gnome_keyring)', 350 'use_gnome_keyring%': '<(use_gnome_keyring)',
346 'linux_fpic%': '<(linux_fpic)', 351 'linux_fpic%': '<(linux_fpic)',
347 'enable_flapper_hacks%': '<(enable_flapper_hacks)', 352 'enable_flapper_hacks%': '<(enable_flapper_hacks)',
353 'enable_pepper_threading%': '<(enable_pepper_threading)',
348 'chromeos%': '<(chromeos)', 354 'chromeos%': '<(chromeos)',
349 'touchui%': '<(touchui)', 355 'touchui%': '<(touchui)',
350 'use_virtual_keyboard%': '<(use_virtual_keyboard)', 356 'use_virtual_keyboard%': '<(use_virtual_keyboard)',
351 'use_xi2_mt%':'<(use_xi2_mt)', 357 'use_xi2_mt%':'<(use_xi2_mt)',
352 'file_manager_extension%': '<(file_manager_extension)', 358 'file_manager_extension%': '<(file_manager_extension)',
353 'webui_task_manager%': '<(webui_task_manager)', 359 'webui_task_manager%': '<(webui_task_manager)',
354 'inside_chromium_build%': '<(inside_chromium_build)', 360 'inside_chromium_build%': '<(inside_chromium_build)',
355 'fastbuild%': '<(fastbuild)', 361 'fastbuild%': '<(fastbuild)',
356 'dcheck_always_on%': '<(dcheck_always_on)', 362 'dcheck_always_on%': '<(dcheck_always_on)',
357 'python_ver%': '<(python_ver)', 363 'python_ver%': '<(python_ver)',
(...skipping 610 matching lines...) Expand 10 before | Expand all | Expand 10 after
968 }], 974 }],
969 ['p2p_apis==1', { 975 ['p2p_apis==1', {
970 'defines': ['ENABLE_P2P_APIS=1'], 976 'defines': ['ENABLE_P2P_APIS=1'],
971 }], 977 }],
972 ['proprietary_codecs==1', { 978 ['proprietary_codecs==1', {
973 'defines': ['USE_PROPRIETARY_CODECS'], 979 'defines': ['USE_PROPRIETARY_CODECS'],
974 }], 980 }],
975 ['enable_flapper_hacks==1', { 981 ['enable_flapper_hacks==1', {
976 'defines': ['ENABLE_FLAPPER_HACKS=1'], 982 'defines': ['ENABLE_FLAPPER_HACKS=1'],
977 }], 983 }],
984 ['enable_pepper_threading==1', {
985 'defines': ['ENABLE_PEPPER_THREADING'],
986 }],
978 ['configuration_policy==1', { 987 ['configuration_policy==1', {
979 'defines': ['ENABLE_CONFIGURATION_POLICY'], 988 'defines': ['ENABLE_CONFIGURATION_POLICY'],
980 }], 989 }],
981 ['fastbuild!=0', { 990 ['fastbuild!=0', {
982 991
983 'conditions': [ 992 'conditions': [
984 # For Windows and Mac, we don't genererate debug information. 993 # For Windows and Mac, we don't genererate debug information.
985 ['OS=="win" or OS=="mac"', { 994 ['OS=="win" or OS=="mac"', {
986 'msvs_settings': { 995 'msvs_settings': {
987 'VCLinkerTool': { 996 'VCLinkerTool': {
(...skipping 1535 matching lines...) Expand 10 before | Expand all | Expand 10 after
2523 # settings in target dicts. SYMROOT is a special case, because many other 2532 # settings in target dicts. SYMROOT is a special case, because many other
2524 # Xcode variables depend on it, including variables such as 2533 # Xcode variables depend on it, including variables such as
2525 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 2534 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
2526 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 2535 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
2527 # files to appear (when present) in the UI as actual files and not red 2536 # files to appear (when present) in the UI as actual files and not red
2528 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 2537 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
2529 # and therefore SYMROOT, needs to be set at the project level. 2538 # and therefore SYMROOT, needs to be set at the project level.
2530 'SYMROOT': '<(DEPTH)/xcodebuild', 2539 'SYMROOT': '<(DEPTH)/xcodebuild',
2531 }, 2540 },
2532 } 2541 }
OLDNEW
« no previous file with comments | « no previous file | ppapi/ppapi_shared.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698