diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-02 05:41:54 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-02 05:41:54 +0000 |
| commit | 85c79b57fcff4dc4c80c8d64fd62aac30cbc968a (patch) | |
| tree | c04e4ee164ad476be4935a67c571c1457b315de7 /chrome/chrome.gyp | |
| parent | 5b3d546e961671f7d9b6f27db04aa22042a9a030 (diff) | |
| download | chromium_src-85c79b57fcff4dc4c80c8d64fd62aac30cbc968a.zip chromium_src-85c79b57fcff4dc4c80c8d64fd62aac30cbc968a.tar.gz chromium_src-85c79b57fcff4dc4c80c8d64fd62aac30cbc968a.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@64718 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome.gyp')
| -rw-r--r-- | chrome/chrome.gyp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index 453138e..f4c9e7e 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -1620,6 +1620,7 @@ '../ipc/ipc.gyp:*', '../media/media.gyp:*', '../net/net.gyp:*', + '../ppapi/ppapi.gyp:*', '../printing/printing.gyp:*', '../sdch/sdch.gyp:*', '../skia/skia.gyp:*', @@ -1637,7 +1638,6 @@ '../third_party/lzma_sdk/lzma_sdk.gyp:*', '../third_party/modp_b64/modp_b64.gyp:*', '../third_party/npapi/npapi.gyp:*', - '../third_party/ppapi/ppapi.gyp:*', '../third_party/sqlite/sqlite.gyp:*', '../third_party/zlib/zlib.gyp:*', '../webkit/support/webkit_support.gyp:*', |