diff options
| author | bbudge@chromium.org <bbudge@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-14 22:29:02 +0000 |
|---|---|---|
| committer | bbudge@chromium.org <bbudge@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-14 22:29:02 +0000 |
| commit | f8ac9201779081a0774af8c30809bda9e770013b (patch) | |
| tree | bb08783419ef53185ef133ddb23a82d215359a79 /chrome/nacl.gypi | |
| parent | 59dc4a7caa3d4cc0b6f08532aa67e94fb1a9a435 (diff) | |
| download | chromium_src-f8ac9201779081a0774af8c30809bda9e770013b.zip chromium_src-f8ac9201779081a0774af8c30809bda9e770013b.tar.gz chromium_src-f8ac9201779081a0774af8c30809bda9e770013b.tar.bz2 | |
Revert 151581 - 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
TBR=bbudge@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10825351
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@151584 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/nacl.gypi')
| -rw-r--r-- | chrome/nacl.gypi | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/chrome/nacl.gypi b/chrome/nacl.gypi index cec7909..8b29869 100644 --- a/chrome/nacl.gypi +++ b/chrome/nacl.gypi @@ -80,7 +80,6 @@ ['disable_nacl_untrusted==0', { 'dependencies': [ '../ppapi/native_client/native_client.gyp:nacl_irt', - '../ppapi/native_client/native_client.gyp:nacl_ipc_irt', ], }], ], |