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

Side by Side Diff: trunk/src/build/common.gypi

Issue 12920003: Revert 189518 "PPAPI: Remove threading options; it's always on" (Closed) Base URL: svn://svn.chromium.org/chrome/
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 | trunk/src/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 304 matching lines...) Expand 10 before | Expand all | Expand 10 after
315 315
316 # Enable language detection. 316 # Enable language detection.
317 'enable_language_detection%': 1, 317 'enable_language_detection%': 1,
318 318
319 # Enable printing support and UI. 319 # Enable printing support and UI.
320 'enable_printing%': 1, 320 'enable_printing%': 1,
321 321
322 # Webrtc compilation is enabled by default. Set to 0 to disable. 322 # Webrtc compilation is enabled by default. Set to 0 to disable.
323 'enable_webrtc%': 1, 323 'enable_webrtc%': 1,
324 324
325 # PPAPI by default does not support plugins making calls off the main
326 # thread. Set to 1 to turn on experimental support for out-of-process
327 # plugins to make call of the main thread.
328 'enable_pepper_threading%': 1,
329
325 # Enables use of the session service, which is enabled by default. 330 # Enables use of the session service, which is enabled by default.
326 # Support for disabling depends on the platform. 331 # Support for disabling depends on the platform.
327 'enable_session_service%': 1, 332 'enable_session_service%': 1,
328 333
329 # Enables theme support, which is enabled by default. Support for 334 # Enables theme support, which is enabled by default. Support for
330 # disabling depends on the platform. 335 # disabling depends on the platform.
331 'enable_themes%': 1, 336 'enable_themes%': 1,
332 337
333 # Enables autofill dialog and associated features; disabled by default. 338 # Enables autofill dialog and associated features; disabled by default.
334 'enable_autofill_dialog%' : 0, 339 'enable_autofill_dialog%' : 0,
(...skipping 333 matching lines...) Expand 10 before | Expand all | Expand 10 after
668 'use_ash%': '<(use_ash)', 673 'use_ash%': '<(use_ash)',
669 'use_openssl%': '<(use_openssl)', 674 'use_openssl%': '<(use_openssl)',
670 'use_nss%': '<(use_nss)', 675 'use_nss%': '<(use_nss)',
671 'os_bsd%': '<(os_bsd)', 676 'os_bsd%': '<(os_bsd)',
672 'os_posix%': '<(os_posix)', 677 'os_posix%': '<(os_posix)',
673 'use_glib%': '<(use_glib)', 678 'use_glib%': '<(use_glib)',
674 'toolkit_uses_gtk%': '<(toolkit_uses_gtk)', 679 'toolkit_uses_gtk%': '<(toolkit_uses_gtk)',
675 'use_x11%': '<(use_x11)', 680 'use_x11%': '<(use_x11)',
676 'use_gnome_keyring%': '<(use_gnome_keyring)', 681 'use_gnome_keyring%': '<(use_gnome_keyring)',
677 'linux_fpic%': '<(linux_fpic)', 682 'linux_fpic%': '<(linux_fpic)',
683 'enable_pepper_threading%': '<(enable_pepper_threading)',
678 'chromeos%': '<(chromeos)', 684 'chromeos%': '<(chromeos)',
679 'enable_viewport%': '<(enable_viewport)', 685 'enable_viewport%': '<(enable_viewport)',
680 'enable_hidpi%': '<(enable_hidpi)', 686 'enable_hidpi%': '<(enable_hidpi)',
681 'enable_touch_ui%': '<(enable_touch_ui)', 687 'enable_touch_ui%': '<(enable_touch_ui)',
682 'use_xi2_mt%':'<(use_xi2_mt)', 688 'use_xi2_mt%':'<(use_xi2_mt)',
683 'file_manager_extension%': '<(file_manager_extension)', 689 'file_manager_extension%': '<(file_manager_extension)',
684 'image_loader_extension%': '<(image_loader_extension)', 690 'image_loader_extension%': '<(image_loader_extension)',
685 'inside_chromium_build%': '<(inside_chromium_build)', 691 'inside_chromium_build%': '<(inside_chromium_build)',
686 'fastbuild%': '<(fastbuild)', 692 'fastbuild%': '<(fastbuild)',
687 'dcheck_always_on%': '<(dcheck_always_on)', 693 'dcheck_always_on%': '<(dcheck_always_on)',
(...skipping 1082 matching lines...) Expand 10 before | Expand all | Expand 10 after
1770 }], 1776 }],
1771 ['remoting==1', { 1777 ['remoting==1', {
1772 'defines': ['ENABLE_REMOTING=1'], 1778 'defines': ['ENABLE_REMOTING=1'],
1773 }], 1779 }],
1774 ['enable_webrtc==1', { 1780 ['enable_webrtc==1', {
1775 'defines': ['ENABLE_WEBRTC=1'], 1781 'defines': ['ENABLE_WEBRTC=1'],
1776 }], 1782 }],
1777 ['proprietary_codecs==1', { 1783 ['proprietary_codecs==1', {
1778 'defines': ['USE_PROPRIETARY_CODECS'], 1784 'defines': ['USE_PROPRIETARY_CODECS'],
1779 }], 1785 }],
1786 ['enable_pepper_threading==1', {
1787 'defines': ['ENABLE_PEPPER_THREADING'],
1788 }],
1780 ['enable_viewport==1', { 1789 ['enable_viewport==1', {
1781 'defines': ['ENABLE_VIEWPORT'], 1790 'defines': ['ENABLE_VIEWPORT'],
1782 }], 1791 }],
1783 ['configuration_policy==1', { 1792 ['configuration_policy==1', {
1784 'defines': ['ENABLE_CONFIGURATION_POLICY'], 1793 'defines': ['ENABLE_CONFIGURATION_POLICY'],
1785 }], 1794 }],
1786 ['input_speech==1', { 1795 ['input_speech==1', {
1787 'defines': ['ENABLE_INPUT_SPEECH'], 1796 'defines': ['ENABLE_INPUT_SPEECH'],
1788 }], 1797 }],
1789 ['notifications==1', { 1798 ['notifications==1', {
(...skipping 2369 matching lines...) Expand 10 before | Expand all | Expand 10 after
4159 # settings in target dicts. SYMROOT is a special case, because many other 4168 # settings in target dicts. SYMROOT is a special case, because many other
4160 # Xcode variables depend on it, including variables such as 4169 # Xcode variables depend on it, including variables such as
4161 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 4170 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
4162 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 4171 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
4163 # files to appear (when present) in the UI as actual files and not red 4172 # files to appear (when present) in the UI as actual files and not red
4164 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 4173 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
4165 # and therefore SYMROOT, needs to be set at the project level. 4174 # and therefore SYMROOT, needs to be set at the project level.
4166 'SYMROOT': '<(DEPTH)/xcodebuild', 4175 'SYMROOT': '<(DEPTH)/xcodebuild',
4167 }, 4176 },
4168 } 4177 }
OLDNEW
« no previous file with comments | « no previous file | trunk/src/content/browser/ppapi_plugin_process_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698