diff options
| author | dmichael@chromium.org <dmichael@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-22 00:45:18 +0000 |
|---|---|---|
| committer | dmichael@chromium.org <dmichael@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-22 00:45:18 +0000 |
| commit | cbadb28a574c215570095c75a0b58723ef09133e (patch) | |
| tree | d96bdc5d5a993a990fa5039dc4f7629aa7e0d200 /build | |
| parent | 79fb246e971eff0851535954d77c04f2bb3f03c1 (diff) | |
| download | chromium_src-cbadb28a574c215570095c75a0b58723ef09133e.zip chromium_src-cbadb28a574c215570095c75a0b58723ef09133e.tar.gz chromium_src-cbadb28a574c215570095c75a0b58723ef09133e.tar.bz2 | |
PPAPI/NaCl: Reenable untrusted IPC proxy gyp flag
The part of chromium that is DEPSed in to WebKit depends on ppapi.gyp via webkit/glue. This puts the conditional include of ppapi_proxy_untrusted.gypi in to a new gyp file creatively named ppapi_proxy_untrusted.gyp. This way we can add it to all.gyp, and we're sure it's not used by WebKit.
See also the previous attempt:
http://codereview.chromium.org/10399068/
And the partial revert of that:
http://codereview.chromium.org/10414010/
BUG=116317
TEST=
Review URL: https://chromiumcodereview.appspot.com/10409061
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@138183 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/all.gyp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/build/all.gyp b/build/all.gyp index 9e28399..132502c 100644 --- a/build/all.gyp +++ b/build/all.gyp @@ -23,6 +23,7 @@ '../net/net.gyp:*', '../ppapi/ppapi.gyp:*', '../ppapi/ppapi_internal.gyp:*', + '../ppapi/ppapi_proxy_untrusted.gyp:*', '../printing/printing.gyp:*', '../sdch/sdch.gyp:*', '../skia/skia.gyp:*', |