summaryrefslogtreecommitdiffstats
path: root/build/all.gyp
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-02 15:59:56 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-02 15:59:56 +0000
commit27c6115d06c4abf1f30d923202db07cf8a71b2cd (patch)
treea0bb7dd0f8fd17a1a99e34ad2bebcb0cc4c2c9fc /build/all.gyp
parent9d86cf75b1e720979b71b8943e7cd68e9687a981 (diff)
downloadchromium_src-27c6115d06c4abf1f30d923202db07cf8a71b2cd.zip
chromium_src-27c6115d06c4abf1f30d923202db07cf8a71b2cd.tar.gz
chromium_src-27c6115d06c4abf1f30d923202db07cf8a71b2cd.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@64750 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/all.gyp')
-rw-r--r--build/all.gyp2
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:*',