diff options
| author | dmichael@chromium.org <dmichael@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-18 22:46:56 +0000 |
|---|---|---|
| committer | dmichael@chromium.org <dmichael@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-18 22:46:56 +0000 |
| commit | 7b38c4e9f68673251cbc257962940d7cb4cb979d (patch) | |
| tree | 9ae985195b083c09e6667c1e2f6b2c03ee4cf71a | |
| parent | ac4c80cd097546013a2eb8b926f327d433dc1cd0 (diff) | |
| download | chromium_src-7b38c4e9f68673251cbc257962940d7cb4cb979d.zip chromium_src-7b38c4e9f68673251cbc257962940d7cb4cb979d.tar.gz chromium_src-7b38c4e9f68673251cbc257962940d7cb4cb979d.tar.bz2 | |
PPAPI/NaCl: Partial revert of r137751 to fix WebKit build
This simply removes the conditional include. I don't think there's a way to get gyp to not _parse_ a file behind a conditional. I need to find a new home for this include in a gyp file that WebKit doesn't include.
TBR=bbudge
BUG=116317
TEST=
Review URL: https://chromiumcodereview.appspot.com/10414010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@137975 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | ppapi/ppapi.gyp | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/ppapi/ppapi.gyp b/ppapi/ppapi.gyp index 7d490f7..2c3323a 100644 --- a/ppapi/ppapi.gyp +++ b/ppapi/ppapi.gyp @@ -7,11 +7,6 @@ # in the .gyp files (since ppapi_internal depends on parts of Chrome). { - 'conditions': [ - ['disable_nacl==0 and build_ppapi_ipc_proxy_untrusted==1', { - 'includes': ['ppapi_proxy_untrusted.gypi'], - }], - ], 'variables': { 'chromium_code': 1, # Use higher warning level. }, |