diff options
| author | bbudge@chromium.org <bbudge@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-14 22:23:07 +0000 |
|---|---|---|
| committer | bbudge@chromium.org <bbudge@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-14 22:23:07 +0000 |
| commit | 62b0b9d4d2182da504c4d29453a3a66e75808837 (patch) | |
| tree | d778d4e78ec4aff33e16fdfde4ee2bf7c71084cf /build/common.gypi | |
| parent | 6e222432916ad0bba015a24d10b9dd216d2325e4 (diff) | |
| download | chromium_src-62b0b9d4d2182da504c4d29453a3a66e75808837.zip chromium_src-62b0b9d4d2182da504c4d29453a3a66e75808837.tar.gz chromium_src-62b0b9d4d2182da504c4d29453a3a66e75808837.tar.bz2 | |
Eliminate the 'build_ppapi_ipc_proxy_untrusted' build flag for untrusted PPAPI proxy builds.
This CL removes our custom GYP flag and modifies the build so both the SRPC and IPC proxies are built side by side. In addition, NaClBrowser now checks the '--enable-nacl-ipc-proxy' flag to determine which IRT to load. The IPC proxy's name is of the form 'nacl_ipc_irt_*'.
BUG=116317
TEST=builds and runs NaCl apps with --enable-nacl-ipc-proxy
Review URL: https://chromiumcodereview.appspot.com/10836220
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@151581 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/common.gypi')
| -rw-r--r-- | build/common.gypi | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/build/common.gypi b/build/common.gypi index 4a973e1..c26a7bd 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -294,11 +294,6 @@ # 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, @@ -558,7 +553,6 @@ '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)', 'enable_viewport%': '<(enable_viewport)', 'enable_hidpi%': '<(enable_hidpi)', |