diff options
| author | noelallen@google.com <noelallen@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-25 19:35:41 +0000 |
|---|---|---|
| committer | noelallen@google.com <noelallen@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-25 19:35:41 +0000 |
| commit | 753f1afd091e32369e7a51adacf28a09f1743f46 (patch) | |
| tree | d6565e0f8b3a5d23043a57bfc4dfc5280af81e4f /ppapi/ppapi.gyp | |
| parent | ef4a5588e6d7395b215adb87d7aa22a2024e3132 (diff) | |
| download | chromium_src-753f1afd091e32369e7a51adacf28a09f1743f46.zip chromium_src-753f1afd091e32369e7a51adacf28a09f1743f46.tar.gz chromium_src-753f1afd091e32369e7a51adacf28a09f1743f46.tar.bz2 | |
Revert 111606 - Avoid references to untrusted.gypi in WebKit
Remove include of untrusted.gypi in normal ppapi gyp files
to prevent WebKit from depending on NaCl.
Refactor PPAPI gyp files to pull out source lists which are
shared between trusted and untrusted targets.
Fix scons hack which pulls list of sources from GYP so that
we can build with scons.
This CL should allow us to revert the DEPS change:
http://trac.webkit.org/changeset/101011 on the webkit side
BUG= none
TEST= Tools/Scripts/update-webkit --chromium
Review URL: http://codereview.chromium.org/8632023
TBR=noelallen@google.com
Review URL: http://codereview.chromium.org/8700010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111608 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/ppapi.gyp')
| -rw-r--r-- | ppapi/ppapi.gyp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ppapi/ppapi.gyp b/ppapi/ppapi.gyp index 2c3323a..7adbf5a 100644 --- a/ppapi/ppapi.gyp +++ b/ppapi/ppapi.gyp @@ -28,7 +28,7 @@ ], }, 'includes': [ - 'ppapi_sources.gypi', + '../native_client/build/untrusted.gypi', 'ppapi_cpp.gypi', 'ppapi_gl.gypi', ], |