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

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: Fix a couple of bad comments. 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') | ppapi/thunk/enter.h » ('J')
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 206 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 # Smooth scrolling is disabled by default. 221 # Smooth scrolling is disabled by default.
222 'enable_smooth_scrolling%': 0, 222 'enable_smooth_scrolling%': 0,
223 223
224 # Webrtc compilation is enabled by default. Set to 0 to disable. 224 # Webrtc compilation is enabled by default. Set to 0 to disable.
225 'enable_webrtc%': 1, 225 'enable_webrtc%': 1,
226 226
227 # PPAPI by default does not support plugins making calls off the main
228 # thread. Set to 1 to turn on experimental support for out-of-process
229 # plugins to make call of the main thread.
230 'enable_pepper_threading%': 0,
231
227 # XInput2 multitouch support is disabled by default (use_xi2_mt=0). 232 # XInput2 multitouch support is disabled by default (use_xi2_mt=0).
228 # Setting to non-zero value enables XI2 MT. When XI2 MT is enabled, 233 # Setting to non-zero value enables XI2 MT. When XI2 MT is enabled,
229 # the input value also defines the required XI2 minor minimum version. 234 # the input value also defines the required XI2 minor minimum version.
230 # For example, use_xi2_mt=2 means XI2.2 or above version is required. 235 # For example, use_xi2_mt=2 means XI2.2 or above version is required.
231 'use_xi2_mt%': 0, 236 'use_xi2_mt%': 0,
232 237
233 # Use of precompiled headers on Windows is off by default 238 # Use of precompiled headers on Windows is off by default
234 # because of complications that it can cause with our 239 # because of complications that it can cause with our
235 # infrastructure (trybots etc.). Enable by setting to 1 in 240 # infrastructure (trybots etc.). Enable by setting to 1 in
236 # ~/.gyp/include.gypi or via the GYP command line for ~20-25% 241 # ~/.gyp/include.gypi or via the GYP command line for ~20-25%
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after
348 'use_openssl%': '<(use_openssl)', 353 'use_openssl%': '<(use_openssl)',
349 'use_nss%': '<(use_nss)', 354 'use_nss%': '<(use_nss)',
350 'os_posix%': '<(os_posix)', 355 'os_posix%': '<(os_posix)',
351 'use_glib%': '<(use_glib)', 356 'use_glib%': '<(use_glib)',
352 'toolkit_uses_gtk%': '<(toolkit_uses_gtk)', 357 'toolkit_uses_gtk%': '<(toolkit_uses_gtk)',
353 'use_skia%': '<(use_skia)', 358 'use_skia%': '<(use_skia)',
354 'use_x11%': '<(use_x11)', 359 'use_x11%': '<(use_x11)',
355 'use_gnome_keyring%': '<(use_gnome_keyring)', 360 'use_gnome_keyring%': '<(use_gnome_keyring)',
356 'linux_fpic%': '<(linux_fpic)', 361 'linux_fpic%': '<(linux_fpic)',
357 'enable_flapper_hacks%': '<(enable_flapper_hacks)', 362 'enable_flapper_hacks%': '<(enable_flapper_hacks)',
363 'enable_pepper_threading%': '<(enable_pepper_threading)',
358 'chromeos%': '<(chromeos)', 364 'chromeos%': '<(chromeos)',
359 'touchui%': '<(touchui)', 365 'touchui%': '<(touchui)',
360 'use_virtual_keyboard%': '<(use_virtual_keyboard)', 366 'use_virtual_keyboard%': '<(use_virtual_keyboard)',
361 'use_xi2_mt%':'<(use_xi2_mt)', 367 'use_xi2_mt%':'<(use_xi2_mt)',
362 'file_manager_extension%': '<(file_manager_extension)', 368 'file_manager_extension%': '<(file_manager_extension)',
363 'webui_task_manager%': '<(webui_task_manager)', 369 'webui_task_manager%': '<(webui_task_manager)',
364 'inside_chromium_build%': '<(inside_chromium_build)', 370 'inside_chromium_build%': '<(inside_chromium_build)',
365 'fastbuild%': '<(fastbuild)', 371 'fastbuild%': '<(fastbuild)',
366 'dcheck_always_on%': '<(dcheck_always_on)', 372 'dcheck_always_on%': '<(dcheck_always_on)',
367 'python_ver%': '<(python_ver)', 373 'python_ver%': '<(python_ver)',
(...skipping 603 matching lines...) Expand 10 before | Expand all | Expand 10 after
971 }], 977 }],
972 ['p2p_apis==1', { 978 ['p2p_apis==1', {
973 'defines': ['ENABLE_P2P_APIS=1'], 979 'defines': ['ENABLE_P2P_APIS=1'],
974 }], 980 }],
975 ['proprietary_codecs==1', { 981 ['proprietary_codecs==1', {
976 'defines': ['USE_PROPRIETARY_CODECS'], 982 'defines': ['USE_PROPRIETARY_CODECS'],
977 }], 983 }],
978 ['enable_flapper_hacks==1', { 984 ['enable_flapper_hacks==1', {
979 'defines': ['ENABLE_FLAPPER_HACKS=1'], 985 'defines': ['ENABLE_FLAPPER_HACKS=1'],
980 }], 986 }],
987 ['enable_pepper_threading==1', {
988 'defines': ['ENABLE_PEPPER_THREADING'],
989 }],
981 ['configuration_policy==1', { 990 ['configuration_policy==1', {
982 'defines': ['ENABLE_CONFIGURATION_POLICY'], 991 'defines': ['ENABLE_CONFIGURATION_POLICY'],
983 }], 992 }],
984 ['fastbuild!=0', { 993 ['fastbuild!=0', {
985 994
986 'conditions': [ 995 'conditions': [
987 # For Windows and Mac, we don't genererate debug information. 996 # For Windows and Mac, we don't genererate debug information.
988 ['OS=="win" or OS=="mac"', { 997 ['OS=="win" or OS=="mac"', {
989 'msvs_settings': { 998 'msvs_settings': {
990 'VCLinkerTool': { 999 'VCLinkerTool': {
(...skipping 1508 matching lines...) Expand 10 before | Expand all | Expand 10 after
2499 # settings in target dicts. SYMROOT is a special case, because many other 2508 # settings in target dicts. SYMROOT is a special case, because many other
2500 # Xcode variables depend on it, including variables such as 2509 # Xcode variables depend on it, including variables such as
2501 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 2510 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
2502 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 2511 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
2503 # files to appear (when present) in the UI as actual files and not red 2512 # files to appear (when present) in the UI as actual files and not red
2504 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 2513 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
2505 # and therefore SYMROOT, needs to be set at the project level. 2514 # and therefore SYMROOT, needs to be set at the project level.
2506 'SYMROOT': '<(DEPTH)/xcodebuild', 2515 'SYMROOT': '<(DEPTH)/xcodebuild',
2507 }, 2516 },
2508 } 2517 }
OLDNEW
« no previous file with comments | « no previous file | ppapi/ppapi_shared.gypi » ('j') | ppapi/thunk/enter.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698