diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-02 16:30:13 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-02 16:30:13 +0000 |
| commit | 882b8b8123cadfe690eb1707b40460b30c3d691d (patch) | |
| tree | 563ddb5aeeebb42dbf004b8f1becd9899b509709 /build/all.gyp | |
| parent | 0c23428a4ffe32a614580b330b66e5b4448fc7af (diff) | |
| download | chromium_src-882b8b8123cadfe690eb1707b40460b30c3d691d.zip chromium_src-882b8b8123cadfe690eb1707b40460b30c3d691d.tar.gz chromium_src-882b8b8123cadfe690eb1707b40460b30c3d691d.tar.bz2 | |
Use PPAPI from chrome trunk rather than pulling via deps. This is a re-land from r64716. This is identical with an an include directory changed in the ppapi repo which I'm hoping was what was confusing everything.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64757 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/all.gyp')
| -rw-r--r-- | build/all.gyp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/build/all.gyp b/build/all.gyp index 76359cb..f109f64 100644 --- a/build/all.gyp +++ b/build/all.gyp @@ -20,6 +20,7 @@ '../jingle/jingle.gyp:*', '../media/media.gyp:*', '../net/net.gyp:*', + '../ppapi/ppapi.gyp:*', '../printing/printing.gyp:*', '../sdch/sdch.gyp:*', '../skia/skia.gyp:*', @@ -40,7 +41,6 @@ '../third_party/mesa/mesa.gyp:*', '../third_party/modp_b64/modp_b64.gyp:*', '../third_party/npapi/npapi.gyp:*', - '../third_party/ppapi/ppapi.gyp:*', '../third_party/ots/ots.gyp:*', '../third_party/sqlite/sqlite.gyp:*', '../third_party/WebKit/WebKit/chromium/WebKit.gyp:*', |