From d5b60631042da040ff33952535f9b4ef25e93e2b Mon Sep 17 00:00:00 2001 From: "noelallen@google.com" Date: Fri, 25 Nov 2011 19:21:38 +0000 Subject: 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 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111606 0039d316-1c4b-4281-b951-d872f2087c98 --- ppapi/ppapi.gyp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ppapi/ppapi.gyp') diff --git a/ppapi/ppapi.gyp b/ppapi/ppapi.gyp index 7adbf5a..2c3323a 100644 --- a/ppapi/ppapi.gyp +++ b/ppapi/ppapi.gyp @@ -28,7 +28,7 @@ ], }, 'includes': [ - '../native_client/build/untrusted.gypi', + 'ppapi_sources.gypi', 'ppapi_cpp.gypi', 'ppapi_gl.gypi', ], -- cgit v1.1