diff options
| author | noelallen@google.com <noelallen@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-01 19:33:21 +0000 |
|---|---|---|
| committer | noelallen@google.com <noelallen@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-01 19:33:21 +0000 |
| commit | 1f081e7a9285a42d5c7672fb59c3f74b8b868a16 (patch) | |
| tree | cc4fb1891b70814f1e8c24ddebe1cce32d1ee105 /ppapi/ppapi_internal.gyp | |
| parent | 7435a779ef35c6a3bc552751c0d576c1cdbcbee9 (diff) | |
| download | chromium_src-1f081e7a9285a42d5c7672fb59c3f74b8b868a16.zip chromium_src-1f081e7a9285a42d5c7672fb59c3f74b8b868a16.tar.gz chromium_src-1f081e7a9285a42d5c7672fb59c3f74b8b868a16.tar.bz2 | |
Avoid references to untrusted.gypi in WebKit
Reapply of http://codereview.chromium.org/8632023/
CLs 8710002 and 8671004 should fix various build issues
related to CrOS and other builders.
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
Submitting tbr to avoid more build change collisions.
TBR= bradnelson@chromium.org
Please review the scons interaction with ppapi_sources.gypi
Review URL: http://codereview.chromium.org/8727029
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@112495 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', |