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

Side by Side Diff: build/common.gypi

Issue 10825351: Revert 151581 - Eliminate the 'build_ppapi_ipc_proxy_untrusted' build flag for untrusted PPAPI prox… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 4 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 | « build/all.gyp ('k') | chrome/browser/nacl_host/nacl_browser.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 276 matching lines...) Expand 10 before | Expand all | Expand 10 after
287 'enable_web_intents_tag%': 0, 287 'enable_web_intents_tag%': 0,
288 288
289 # Webrtc compilation is enabled by default. Set to 0 to disable. 289 # Webrtc compilation is enabled by default. Set to 0 to disable.
290 'enable_webrtc%': 1, 290 'enable_webrtc%': 1,
291 291
292 # PPAPI by default does not support plugins making calls off the main 292 # PPAPI by default does not support plugins making calls off the main
293 # thread. Set to 1 to turn on experimental support for out-of-process 293 # thread. Set to 1 to turn on experimental support for out-of-process
294 # plugins to make call of the main thread. 294 # plugins to make call of the main thread.
295 'enable_pepper_threading%': 0, 295 'enable_pepper_threading%': 0,
296 296
297 # Include the PPAPI IPC proxy for NaCl. This is a work-in-progress; this
298 # allows us to build this feature locally without it affecting others
299 # working in affected subsystems like base and ipc.
300 'build_ppapi_ipc_proxy_untrusted%': 0,
301
297 # Enables use of the session service, which is enabled by default. 302 # Enables use of the session service, which is enabled by default.
298 # Support for disabling depends on the platform. 303 # Support for disabling depends on the platform.
299 'enable_session_service%': 1, 304 'enable_session_service%': 1,
300 305
301 # Enables theme support, which is enabled by default. Support for 306 # Enables theme support, which is enabled by default. Support for
302 # disabling depends on the platform. 307 # disabling depends on the platform.
303 'enable_themes%': 1, 308 'enable_themes%': 1,
304 309
305 # Enables support for background apps. 310 # Enables support for background apps.
306 'enable_background%': 1, 311 'enable_background%': 1,
(...skipping 239 matching lines...) Expand 10 before | Expand all | Expand 10 after
546 'use_nss%': '<(use_nss)', 551 'use_nss%': '<(use_nss)',
547 'os_bsd%': '<(os_bsd)', 552 'os_bsd%': '<(os_bsd)',
548 'os_posix%': '<(os_posix)', 553 'os_posix%': '<(os_posix)',
549 'use_glib%': '<(use_glib)', 554 'use_glib%': '<(use_glib)',
550 'toolkit_uses_gtk%': '<(toolkit_uses_gtk)', 555 'toolkit_uses_gtk%': '<(toolkit_uses_gtk)',
551 'use_skia%': '<(use_skia)', 556 'use_skia%': '<(use_skia)',
552 'use_x11%': '<(use_x11)', 557 'use_x11%': '<(use_x11)',
553 'use_gnome_keyring%': '<(use_gnome_keyring)', 558 'use_gnome_keyring%': '<(use_gnome_keyring)',
554 'linux_fpic%': '<(linux_fpic)', 559 'linux_fpic%': '<(linux_fpic)',
555 'enable_pepper_threading%': '<(enable_pepper_threading)', 560 'enable_pepper_threading%': '<(enable_pepper_threading)',
561 'build_ppapi_ipc_proxy_untrusted%': '<(build_ppapi_ipc_proxy_untrusted)',
556 'chromeos%': '<(chromeos)', 562 'chromeos%': '<(chromeos)',
557 'enable_viewport%': '<(enable_viewport)', 563 'enable_viewport%': '<(enable_viewport)',
558 'enable_hidpi%': '<(enable_hidpi)', 564 'enable_hidpi%': '<(enable_hidpi)',
559 'enable_touch_ui%': '<(enable_touch_ui)', 565 'enable_touch_ui%': '<(enable_touch_ui)',
560 'use_xi2_mt%':'<(use_xi2_mt)', 566 'use_xi2_mt%':'<(use_xi2_mt)',
561 'file_manager_extension%': '<(file_manager_extension)', 567 'file_manager_extension%': '<(file_manager_extension)',
562 'inside_chromium_build%': '<(inside_chromium_build)', 568 'inside_chromium_build%': '<(inside_chromium_build)',
563 'fastbuild%': '<(fastbuild)', 569 'fastbuild%': '<(fastbuild)',
564 'dcheck_always_on%': '<(dcheck_always_on)', 570 'dcheck_always_on%': '<(dcheck_always_on)',
565 'python_ver%': '<(python_ver)', 571 'python_ver%': '<(python_ver)',
(...skipping 2810 matching lines...) Expand 10 before | Expand all | Expand 10 after
3376 # settings in target dicts. SYMROOT is a special case, because many other 3382 # settings in target dicts. SYMROOT is a special case, because many other
3377 # Xcode variables depend on it, including variables such as 3383 # Xcode variables depend on it, including variables such as
3378 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 3384 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
3379 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 3385 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
3380 # files to appear (when present) in the UI as actual files and not red 3386 # files to appear (when present) in the UI as actual files and not red
3381 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 3387 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
3382 # and therefore SYMROOT, needs to be set at the project level. 3388 # and therefore SYMROOT, needs to be set at the project level.
3383 'SYMROOT': '<(DEPTH)/xcodebuild', 3389 'SYMROOT': '<(DEPTH)/xcodebuild',
3384 }, 3390 },
3385 } 3391 }
OLDNEW
« no previous file with comments | « build/all.gyp ('k') | chrome/browser/nacl_host/nacl_browser.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698