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

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

Issue 13328006: Revert 191420 "PPAPI: Remove threading options; it's always on" (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 8 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 336 matching lines...) Expand 10 before | Expand all | Expand 10 after
671 'use_ash%': '<(use_ash)', 676 'use_ash%': '<(use_ash)',
672 'use_openssl%': '<(use_openssl)', 677 'use_openssl%': '<(use_openssl)',
673 'use_nss%': '<(use_nss)', 678 'use_nss%': '<(use_nss)',
674 'os_bsd%': '<(os_bsd)', 679 'os_bsd%': '<(os_bsd)',
675 'os_posix%': '<(os_posix)', 680 'os_posix%': '<(os_posix)',
676 'use_glib%': '<(use_glib)', 681 'use_glib%': '<(use_glib)',
677 'toolkit_uses_gtk%': '<(toolkit_uses_gtk)', 682 'toolkit_uses_gtk%': '<(toolkit_uses_gtk)',
678 'use_x11%': '<(use_x11)', 683 'use_x11%': '<(use_x11)',
679 'use_gnome_keyring%': '<(use_gnome_keyring)', 684 'use_gnome_keyring%': '<(use_gnome_keyring)',
680 'linux_fpic%': '<(linux_fpic)', 685 'linux_fpic%': '<(linux_fpic)',
686 'enable_pepper_threading%': '<(enable_pepper_threading)',
681 'chromeos%': '<(chromeos)', 687 'chromeos%': '<(chromeos)',
682 'enable_viewport%': '<(enable_viewport)', 688 'enable_viewport%': '<(enable_viewport)',
683 'enable_hidpi%': '<(enable_hidpi)', 689 'enable_hidpi%': '<(enable_hidpi)',
684 'enable_touch_ui%': '<(enable_touch_ui)', 690 'enable_touch_ui%': '<(enable_touch_ui)',
685 'use_xi2_mt%':'<(use_xi2_mt)', 691 'use_xi2_mt%':'<(use_xi2_mt)',
686 'file_manager_extension%': '<(file_manager_extension)', 692 'file_manager_extension%': '<(file_manager_extension)',
687 'image_loader_extension%': '<(image_loader_extension)', 693 'image_loader_extension%': '<(image_loader_extension)',
688 'inside_chromium_build%': '<(inside_chromium_build)', 694 'inside_chromium_build%': '<(inside_chromium_build)',
689 'fastbuild%': '<(fastbuild)', 695 'fastbuild%': '<(fastbuild)',
690 'dcheck_always_on%': '<(dcheck_always_on)', 696 'dcheck_always_on%': '<(dcheck_always_on)',
(...skipping 1083 matching lines...) Expand 10 before | Expand all | Expand 10 after
1774 }], 1780 }],
1775 ['remoting==1', { 1781 ['remoting==1', {
1776 'defines': ['ENABLE_REMOTING=1'], 1782 'defines': ['ENABLE_REMOTING=1'],
1777 }], 1783 }],
1778 ['enable_webrtc==1', { 1784 ['enable_webrtc==1', {
1779 'defines': ['ENABLE_WEBRTC=1'], 1785 'defines': ['ENABLE_WEBRTC=1'],
1780 }], 1786 }],
1781 ['proprietary_codecs==1', { 1787 ['proprietary_codecs==1', {
1782 'defines': ['USE_PROPRIETARY_CODECS'], 1788 'defines': ['USE_PROPRIETARY_CODECS'],
1783 }], 1789 }],
1790 ['enable_pepper_threading==1', {
1791 'defines': ['ENABLE_PEPPER_THREADING'],
1792 }],
1784 ['enable_viewport==1', { 1793 ['enable_viewport==1', {
1785 'defines': ['ENABLE_VIEWPORT'], 1794 'defines': ['ENABLE_VIEWPORT'],
1786 }], 1795 }],
1787 ['configuration_policy==1', { 1796 ['configuration_policy==1', {
1788 'defines': ['ENABLE_CONFIGURATION_POLICY'], 1797 'defines': ['ENABLE_CONFIGURATION_POLICY'],
1789 }], 1798 }],
1790 ['input_speech==1', { 1799 ['input_speech==1', {
1791 'defines': ['ENABLE_INPUT_SPEECH'], 1800 'defines': ['ENABLE_INPUT_SPEECH'],
1792 }], 1801 }],
1793 ['notifications==1', { 1802 ['notifications==1', {
(...skipping 2379 matching lines...) Expand 10 before | Expand all | Expand 10 after
4173 # settings in target dicts. SYMROOT is a special case, because many other 4182 # settings in target dicts. SYMROOT is a special case, because many other
4174 # Xcode variables depend on it, including variables such as 4183 # Xcode variables depend on it, including variables such as
4175 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 4184 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
4176 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 4185 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
4177 # files to appear (when present) in the UI as actual files and not red 4186 # files to appear (when present) in the UI as actual files and not red
4178 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 4187 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
4179 # and therefore SYMROOT, needs to be set at the project level. 4188 # and therefore SYMROOT, needs to be set at the project level.
4180 'SYMROOT': '<(DEPTH)/xcodebuild', 4189 'SYMROOT': '<(DEPTH)/xcodebuild',
4181 }, 4190 },
4182 } 4191 }
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