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

Side by Side Diff: build/common.gypi

Issue 12504007: Revert 186925 since it breaks many of the builds on the bots (e.g. (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 | chrome/test/ppapi/ppapi_browsertest.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 302 matching lines...) Expand 10 before | Expand all | Expand 10 after
313 313
314 # Enable language detection. 314 # Enable language detection.
315 'enable_language_detection%': 1, 315 'enable_language_detection%': 1,
316 316
317 # Enable printing support and UI. 317 # Enable printing support and UI.
318 'enable_printing%': 1, 318 'enable_printing%': 1,
319 319
320 # Webrtc compilation is enabled by default. Set to 0 to disable. 320 # Webrtc compilation is enabled by default. Set to 0 to disable.
321 'enable_webrtc%': 1, 321 'enable_webrtc%': 1,
322 322
323 # PPAPI by default does not support plugins making calls off the main
324 # thread. Set to 1 to turn on experimental support for out-of-process
325 # plugins to make call of the main thread.
326 'enable_pepper_threading%': 1,
327
323 # Enables use of the session service, which is enabled by default. 328 # Enables use of the session service, which is enabled by default.
324 # Support for disabling depends on the platform. 329 # Support for disabling depends on the platform.
325 'enable_session_service%': 1, 330 'enable_session_service%': 1,
326 331
327 # Enables theme support, which is enabled by default. Support for 332 # Enables theme support, which is enabled by default. Support for
328 # disabling depends on the platform. 333 # disabling depends on the platform.
329 'enable_themes%': 1, 334 'enable_themes%': 1,
330 335
331 # Enables autofill dialog and associated features; disabled by default. 336 # Enables autofill dialog and associated features; disabled by default.
332 'enable_autofill_dialog%' : 0, 337 'enable_autofill_dialog%' : 0,
(...skipping 326 matching lines...) Expand 10 before | Expand all | Expand 10 after
659 'use_ash%': '<(use_ash)', 664 'use_ash%': '<(use_ash)',
660 'use_openssl%': '<(use_openssl)', 665 'use_openssl%': '<(use_openssl)',
661 'use_nss%': '<(use_nss)', 666 'use_nss%': '<(use_nss)',
662 'os_bsd%': '<(os_bsd)', 667 'os_bsd%': '<(os_bsd)',
663 'os_posix%': '<(os_posix)', 668 'os_posix%': '<(os_posix)',
664 'use_glib%': '<(use_glib)', 669 'use_glib%': '<(use_glib)',
665 'toolkit_uses_gtk%': '<(toolkit_uses_gtk)', 670 'toolkit_uses_gtk%': '<(toolkit_uses_gtk)',
666 'use_x11%': '<(use_x11)', 671 'use_x11%': '<(use_x11)',
667 'use_gnome_keyring%': '<(use_gnome_keyring)', 672 'use_gnome_keyring%': '<(use_gnome_keyring)',
668 'linux_fpic%': '<(linux_fpic)', 673 'linux_fpic%': '<(linux_fpic)',
674 'enable_pepper_threading%': '<(enable_pepper_threading)',
669 'chromeos%': '<(chromeos)', 675 'chromeos%': '<(chromeos)',
670 'enable_viewport%': '<(enable_viewport)', 676 'enable_viewport%': '<(enable_viewport)',
671 'enable_hidpi%': '<(enable_hidpi)', 677 'enable_hidpi%': '<(enable_hidpi)',
672 'enable_touch_ui%': '<(enable_touch_ui)', 678 'enable_touch_ui%': '<(enable_touch_ui)',
673 'use_xi2_mt%':'<(use_xi2_mt)', 679 'use_xi2_mt%':'<(use_xi2_mt)',
674 'file_manager_extension%': '<(file_manager_extension)', 680 'file_manager_extension%': '<(file_manager_extension)',
675 'image_loader_extension%': '<(image_loader_extension)', 681 'image_loader_extension%': '<(image_loader_extension)',
676 'inside_chromium_build%': '<(inside_chromium_build)', 682 'inside_chromium_build%': '<(inside_chromium_build)',
677 'fastbuild%': '<(fastbuild)', 683 'fastbuild%': '<(fastbuild)',
678 'dcheck_always_on%': '<(dcheck_always_on)', 684 'dcheck_always_on%': '<(dcheck_always_on)',
(...skipping 1066 matching lines...) Expand 10 before | Expand all | Expand 10 after
1745 }], 1751 }],
1746 ['remoting==1', { 1752 ['remoting==1', {
1747 'defines': ['ENABLE_REMOTING=1'], 1753 'defines': ['ENABLE_REMOTING=1'],
1748 }], 1754 }],
1749 ['enable_webrtc==1', { 1755 ['enable_webrtc==1', {
1750 'defines': ['ENABLE_WEBRTC=1'], 1756 'defines': ['ENABLE_WEBRTC=1'],
1751 }], 1757 }],
1752 ['proprietary_codecs==1', { 1758 ['proprietary_codecs==1', {
1753 'defines': ['USE_PROPRIETARY_CODECS'], 1759 'defines': ['USE_PROPRIETARY_CODECS'],
1754 }], 1760 }],
1761 ['enable_pepper_threading==1', {
1762 'defines': ['ENABLE_PEPPER_THREADING'],
1763 }],
1755 ['enable_viewport==1', { 1764 ['enable_viewport==1', {
1756 'defines': ['ENABLE_VIEWPORT'], 1765 'defines': ['ENABLE_VIEWPORT'],
1757 }], 1766 }],
1758 ['configuration_policy==1', { 1767 ['configuration_policy==1', {
1759 'defines': ['ENABLE_CONFIGURATION_POLICY'], 1768 'defines': ['ENABLE_CONFIGURATION_POLICY'],
1760 }], 1769 }],
1761 ['input_speech==1', { 1770 ['input_speech==1', {
1762 'defines': ['ENABLE_INPUT_SPEECH'], 1771 'defines': ['ENABLE_INPUT_SPEECH'],
1763 }], 1772 }],
1764 ['notifications==1', { 1773 ['notifications==1', {
(...skipping 2335 matching lines...) Expand 10 before | Expand all | Expand 10 after
4100 # settings in target dicts. SYMROOT is a special case, because many other 4109 # settings in target dicts. SYMROOT is a special case, because many other
4101 # Xcode variables depend on it, including variables such as 4110 # Xcode variables depend on it, including variables such as
4102 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 4111 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
4103 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 4112 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
4104 # files to appear (when present) in the UI as actual files and not red 4113 # files to appear (when present) in the UI as actual files and not red
4105 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 4114 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
4106 # and therefore SYMROOT, needs to be set at the project level. 4115 # and therefore SYMROOT, needs to be set at the project level.
4107 'SYMROOT': '<(DEPTH)/xcodebuild', 4116 'SYMROOT': '<(DEPTH)/xcodebuild',
4108 }, 4117 },
4109 } 4118 }
OLDNEW
« no previous file with comments | « no previous file | chrome/test/ppapi/ppapi_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698