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

Side by Side Diff: build/common.gypi

Issue 12457021: Revert 187427 "PPAPI: Remove threading options; it's always on" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 7 years, 9 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 | content/browser/ppapi_plugin_process_host.cc » ('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) 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 303 matching lines...) Expand 10 before | Expand all | Expand 10 after
314 314
315 # Enable language detection. 315 # Enable language detection.
316 'enable_language_detection%': 1, 316 'enable_language_detection%': 1,
317 317
318 # Enable printing support and UI. 318 # Enable printing support and UI.
319 'enable_printing%': 1, 319 'enable_printing%': 1,
320 320
321 # Webrtc compilation is enabled by default. Set to 0 to disable. 321 # Webrtc compilation is enabled by default. Set to 0 to disable.
322 'enable_webrtc%': 1, 322 'enable_webrtc%': 1,
323 323
324 # PPAPI by default does not support plugins making calls off the main
325 # thread. Set to 1 to turn on experimental support for out-of-process
326 # plugins to make call of the main thread.
327 'enable_pepper_threading%': 1,
328
324 # Enables use of the session service, which is enabled by default. 329 # Enables use of the session service, which is enabled by default.
325 # Support for disabling depends on the platform. 330 # Support for disabling depends on the platform.
326 'enable_session_service%': 1, 331 'enable_session_service%': 1,
327 332
328 # Enables theme support, which is enabled by default. Support for 333 # Enables theme support, which is enabled by default. Support for
329 # disabling depends on the platform. 334 # disabling depends on the platform.
330 'enable_themes%': 1, 335 'enable_themes%': 1,
331 336
332 # Enables autofill dialog and associated features; disabled by default. 337 # Enables autofill dialog and associated features; disabled by default.
333 'enable_autofill_dialog%' : 0, 338 'enable_autofill_dialog%' : 0,
(...skipping 327 matching lines...) Expand 10 before | Expand all | Expand 10 after
661 'use_ash%': '<(use_ash)', 666 'use_ash%': '<(use_ash)',
662 'use_openssl%': '<(use_openssl)', 667 'use_openssl%': '<(use_openssl)',
663 'use_nss%': '<(use_nss)', 668 'use_nss%': '<(use_nss)',
664 'os_bsd%': '<(os_bsd)', 669 'os_bsd%': '<(os_bsd)',
665 'os_posix%': '<(os_posix)', 670 'os_posix%': '<(os_posix)',
666 'use_glib%': '<(use_glib)', 671 'use_glib%': '<(use_glib)',
667 'toolkit_uses_gtk%': '<(toolkit_uses_gtk)', 672 'toolkit_uses_gtk%': '<(toolkit_uses_gtk)',
668 'use_x11%': '<(use_x11)', 673 'use_x11%': '<(use_x11)',
669 'use_gnome_keyring%': '<(use_gnome_keyring)', 674 'use_gnome_keyring%': '<(use_gnome_keyring)',
670 'linux_fpic%': '<(linux_fpic)', 675 'linux_fpic%': '<(linux_fpic)',
676 'enable_pepper_threading%': '<(enable_pepper_threading)',
671 'chromeos%': '<(chromeos)', 677 'chromeos%': '<(chromeos)',
672 'enable_viewport%': '<(enable_viewport)', 678 'enable_viewport%': '<(enable_viewport)',
673 'enable_hidpi%': '<(enable_hidpi)', 679 'enable_hidpi%': '<(enable_hidpi)',
674 'enable_touch_ui%': '<(enable_touch_ui)', 680 'enable_touch_ui%': '<(enable_touch_ui)',
675 'use_xi2_mt%':'<(use_xi2_mt)', 681 'use_xi2_mt%':'<(use_xi2_mt)',
676 'file_manager_extension%': '<(file_manager_extension)', 682 'file_manager_extension%': '<(file_manager_extension)',
677 'image_loader_extension%': '<(image_loader_extension)', 683 'image_loader_extension%': '<(image_loader_extension)',
678 'inside_chromium_build%': '<(inside_chromium_build)', 684 'inside_chromium_build%': '<(inside_chromium_build)',
679 'fastbuild%': '<(fastbuild)', 685 'fastbuild%': '<(fastbuild)',
680 'dcheck_always_on%': '<(dcheck_always_on)', 686 'dcheck_always_on%': '<(dcheck_always_on)',
(...skipping 1076 matching lines...) Expand 10 before | Expand all | Expand 10 after
1757 }], 1763 }],
1758 ['remoting==1', { 1764 ['remoting==1', {
1759 'defines': ['ENABLE_REMOTING=1'], 1765 'defines': ['ENABLE_REMOTING=1'],
1760 }], 1766 }],
1761 ['enable_webrtc==1', { 1767 ['enable_webrtc==1', {
1762 'defines': ['ENABLE_WEBRTC=1'], 1768 'defines': ['ENABLE_WEBRTC=1'],
1763 }], 1769 }],
1764 ['proprietary_codecs==1', { 1770 ['proprietary_codecs==1', {
1765 'defines': ['USE_PROPRIETARY_CODECS'], 1771 'defines': ['USE_PROPRIETARY_CODECS'],
1766 }], 1772 }],
1773 ['enable_pepper_threading==1', {
1774 'defines': ['ENABLE_PEPPER_THREADING'],
1775 }],
1767 ['enable_viewport==1', { 1776 ['enable_viewport==1', {
1768 'defines': ['ENABLE_VIEWPORT'], 1777 'defines': ['ENABLE_VIEWPORT'],
1769 }], 1778 }],
1770 ['configuration_policy==1', { 1779 ['configuration_policy==1', {
1771 'defines': ['ENABLE_CONFIGURATION_POLICY'], 1780 'defines': ['ENABLE_CONFIGURATION_POLICY'],
1772 }], 1781 }],
1773 ['input_speech==1', { 1782 ['input_speech==1', {
1774 'defines': ['ENABLE_INPUT_SPEECH'], 1783 'defines': ['ENABLE_INPUT_SPEECH'],
1775 }], 1784 }],
1776 ['notifications==1', { 1785 ['notifications==1', {
(...skipping 2364 matching lines...) Expand 10 before | Expand all | Expand 10 after
4141 # settings in target dicts. SYMROOT is a special case, because many other 4150 # settings in target dicts. SYMROOT is a special case, because many other
4142 # Xcode variables depend on it, including variables such as 4151 # Xcode variables depend on it, including variables such as
4143 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 4152 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
4144 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 4153 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
4145 # files to appear (when present) in the UI as actual files and not red 4154 # files to appear (when present) in the UI as actual files and not red
4146 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 4155 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
4147 # and therefore SYMROOT, needs to be set at the project level. 4156 # and therefore SYMROOT, needs to be set at the project level.
4148 'SYMROOT': '<(DEPTH)/xcodebuild', 4157 'SYMROOT': '<(DEPTH)/xcodebuild',
4149 }, 4158 },
4150 } 4159 }
OLDNEW
« no previous file with comments | « no previous file | content/browser/ppapi_plugin_process_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698