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

Side by Side Diff: build/common.gypi

Issue 10399068: PPAPI/NaCl: Make a gyp flag for including the untrusted IPC proxy. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: mseaborn's review comments. Created 8 years, 7 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 | ppapi/ppapi.gyp » ('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 255 matching lines...) Expand 10 before | Expand all | Expand 10 after
266 'enable_web_intents_tag%': 0, 266 'enable_web_intents_tag%': 0,
267 267
268 # Webrtc compilation is enabled by default. Set to 0 to disable. 268 # Webrtc compilation is enabled by default. Set to 0 to disable.
269 'enable_webrtc%': 1, 269 'enable_webrtc%': 1,
270 270
271 # PPAPI by default does not support plugins making calls off the main 271 # PPAPI by default does not support plugins making calls off the main
272 # thread. Set to 1 to turn on experimental support for out-of-process 272 # thread. Set to 1 to turn on experimental support for out-of-process
273 # plugins to make call of the main thread. 273 # plugins to make call of the main thread.
274 'enable_pepper_threading%': 0, 274 'enable_pepper_threading%': 0,
275 275
276 # Include the PPAPI IPC proxy for NaCl. This is a work-in-progress; this
277 # allows us to build this feature locally without it affecting others
278 # working in affected subsystems like base and ipc.
279 'build_ppapi_ipc_proxy_untrusted%': 0,
280
276 # Enables use of the session service, which is enabled by default. 281 # Enables use of the session service, which is enabled by default.
277 # Support for disabling depends on the platform. 282 # Support for disabling depends on the platform.
278 'enable_session_service%': 1, 283 'enable_session_service%': 1,
279 284
280 # Enables theme support, which is enabled by default. Support for 285 # Enables theme support, which is enabled by default. Support for
281 # disabling depends on the platform. 286 # disabling depends on the platform.
282 'enable_themes%': 1, 287 'enable_themes%': 1,
283 288
284 # Enables support for background apps. 289 # Enables support for background apps.
285 'enable_background%': 1, 290 'enable_background%': 1,
(...skipping 230 matching lines...) Expand 10 before | Expand all | Expand 10 after
516 'use_nss%': '<(use_nss)', 521 'use_nss%': '<(use_nss)',
517 'os_bsd%': '<(os_bsd)', 522 'os_bsd%': '<(os_bsd)',
518 'os_posix%': '<(os_posix)', 523 'os_posix%': '<(os_posix)',
519 'use_glib%': '<(use_glib)', 524 'use_glib%': '<(use_glib)',
520 'toolkit_uses_gtk%': '<(toolkit_uses_gtk)', 525 'toolkit_uses_gtk%': '<(toolkit_uses_gtk)',
521 'use_skia%': '<(use_skia)', 526 'use_skia%': '<(use_skia)',
522 'use_x11%': '<(use_x11)', 527 'use_x11%': '<(use_x11)',
523 'use_gnome_keyring%': '<(use_gnome_keyring)', 528 'use_gnome_keyring%': '<(use_gnome_keyring)',
524 'linux_fpic%': '<(linux_fpic)', 529 'linux_fpic%': '<(linux_fpic)',
525 'enable_pepper_threading%': '<(enable_pepper_threading)', 530 'enable_pepper_threading%': '<(enable_pepper_threading)',
531 'build_ppapi_ipc_proxy_untrusted%': '<(build_ppapi_ipc_proxy_untrusted)',
526 'chromeos%': '<(chromeos)', 532 'chromeos%': '<(chromeos)',
527 'use_virtual_keyboard%': '<(use_virtual_keyboard)', 533 'use_virtual_keyboard%': '<(use_virtual_keyboard)',
528 'enable_viewport%': '<(enable_viewport)', 534 'enable_viewport%': '<(enable_viewport)',
529 'enable_hidpi%': '<(enable_hidpi)', 535 'enable_hidpi%': '<(enable_hidpi)',
530 'enable_touch_ui%': '<(enable_touch_ui)', 536 'enable_touch_ui%': '<(enable_touch_ui)',
531 'enable_metro%': '<(enable_metro)', 537 'enable_metro%': '<(enable_metro)',
532 'use_xi2_mt%':'<(use_xi2_mt)', 538 'use_xi2_mt%':'<(use_xi2_mt)',
533 'file_manager_extension%': '<(file_manager_extension)', 539 'file_manager_extension%': '<(file_manager_extension)',
534 'webui_task_manager%': '<(webui_task_manager)', 540 'webui_task_manager%': '<(webui_task_manager)',
535 'inside_chromium_build%': '<(inside_chromium_build)', 541 'inside_chromium_build%': '<(inside_chromium_build)',
(...skipping 2556 matching lines...) Expand 10 before | Expand all | Expand 10 after
3092 # settings in target dicts. SYMROOT is a special case, because many other 3098 # settings in target dicts. SYMROOT is a special case, because many other
3093 # Xcode variables depend on it, including variables such as 3099 # Xcode variables depend on it, including variables such as
3094 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 3100 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
3095 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 3101 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
3096 # files to appear (when present) in the UI as actual files and not red 3102 # files to appear (when present) in the UI as actual files and not red
3097 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 3103 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
3098 # and therefore SYMROOT, needs to be set at the project level. 3104 # and therefore SYMROOT, needs to be set at the project level.
3099 'SYMROOT': '<(DEPTH)/xcodebuild', 3105 'SYMROOT': '<(DEPTH)/xcodebuild',
3100 }, 3106 },
3101 } 3107 }
OLDNEW
« no previous file with comments | « no previous file | ppapi/ppapi.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698