summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authordmichael@chromium.org <dmichael@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-17 22:25:10 +0000
committerdmichael@chromium.org <dmichael@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-17 22:25:10 +0000
commitb11afaf2c35bca16adae6595bda8999b8d0bcf60 (patch)
tree2364f73563b2491ff5c3aa4191113308eb8981fa /build
parent188ed7c8712ce0cbe5aa58e76cf9c4301004f195 (diff)
downloadchromium_src-b11afaf2c35bca16adae6595bda8999b8d0bcf60.zip
chromium_src-b11afaf2c35bca16adae6595bda8999b8d0bcf60.tar.gz
chromium_src-b11afaf2c35bca16adae6595bda8999b8d0bcf60.tar.bz2
PPAPI/NaCl: Make a gyp flag for including the untrusted IPC proxy.
This way, those of us working on the proxy switch need only add: { 'variables': { 'build_ppapi_ipc_proxy_untrusted': '1', }, } to "~/.gyp/include.gypi" ...and we'll be able to build our untrusted targets without editing all.gyp. For anybody who doesn't set that flag, our ppapi_proxy_untrusted.gypi file will still be parsed, but it doesn't matter if the source files build (or even exist). BUG=116317 TEST= Review URL: https://chromiumcodereview.appspot.com/10399068 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@137751 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
-rw-r--r--build/common.gypi6
1 files changed, 6 insertions, 0 deletions
diff --git a/build/common.gypi b/build/common.gypi
index e2e9c07..3cc9053 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -273,6 +273,11 @@
# plugins to make call of the main thread.
'enable_pepper_threading%': 0,
+ # Include the PPAPI IPC proxy for NaCl. This is a work-in-progress; this
+ # allows us to build this feature locally without it affecting others
+ # working in affected subsystems like base and ipc.
+ 'build_ppapi_ipc_proxy_untrusted%': 0,
+
# Enables use of the session service, which is enabled by default.
# Support for disabling depends on the platform.
'enable_session_service%': 1,
@@ -523,6 +528,7 @@
'use_gnome_keyring%': '<(use_gnome_keyring)',
'linux_fpic%': '<(linux_fpic)',
'enable_pepper_threading%': '<(enable_pepper_threading)',
+ 'build_ppapi_ipc_proxy_untrusted%': '<(build_ppapi_ipc_proxy_untrusted)',
'chromeos%': '<(chromeos)',
'use_virtual_keyboard%': '<(use_virtual_keyboard)',
'enable_viewport%': '<(enable_viewport)',