diff options
| author | noelallen@google.com <noelallen@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-25 23:46:52 +0000 |
|---|---|---|
| committer | noelallen@google.com <noelallen@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-25 23:46:52 +0000 |
| commit | 11ab43069b7abd54f42fb63fa01b861e3a5803b2 (patch) | |
| tree | 4e8023b48b389eecc02253dc67212b86e47272fd /ppapi/ppapi_internal.gyp | |
| parent | da73ca578c376c6eeea054f4ea77dd4204edbd61 (diff) | |
| download | chromium_src-11ab43069b7abd54f42fb63fa01b861e3a5803b2.zip chromium_src-11ab43069b7abd54f42fb63fa01b861e3a5803b2.tar.gz chromium_src-11ab43069b7abd54f42fb63fa01b861e3a5803b2.tar.bz2 | |
Reapply of http://codereview.chromium.org/8632023/
The original CL failed on Mac.
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
TRB= dmichael@chromium.org
Review URL: http://codereview.chromium.org/8701008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111618 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/ppapi_internal.gyp')
| -rw-r--r-- | ppapi/ppapi_internal.gyp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ppapi/ppapi_internal.gyp b/ppapi/ppapi_internal.gyp index 1a9b476..6bf0565 100644 --- a/ppapi/ppapi_internal.gyp +++ b/ppapi/ppapi_internal.gyp @@ -24,7 +24,7 @@ ], }, 'includes': [ - '../native_client/build/untrusted.gypi', + 'ppapi_sources.gypi', 'ppapi_proxy.gypi', 'ppapi_shared.gypi', 'ppapi_tests.gypi', |