Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(454)

Issue 8635015: Refactor use of ppapi_cpp and ppapi_tests to avoid include of untrusted.gypi (Closed)

Created:
9 years, 1 month ago by noelallen1
Modified:
8 years, 11 months ago
CC:
chromium-reviews, jamiewalch+watch_chromium.org, hclam+watch_chromium.org, simonmorris+watch_chromium.org, wez+watch_chromium.org, dmaclach+watch_chromium.org, apatrick_chromium, garykac+watch_chromium.org, lambroslambrou+watch_chromium.org, ajwong+watch_chromium.org, sergeyu+watch_chromium.org
Visibility:
Public.

Description

Refactor use of ppapi_cpp and ppapi_tests to avoid include of untrusted.gypi Unfortunately a conditional include does not prevent GYP from attempting to load the include file. It just loads the file and ignores it. For this reason, a conditional include can not be used to work around a non-existent file. Since WebKit doesn't care about anything other than the ppapi_c target, we remove the ppapi_c target from ppapi_cpp.gypi, and put it in it's own file. This allows us to remove the include of untrusted.gypi from the ppapi.gyp file. We do a similar thing to ppapi_internal.gyp. So instead we put pull in untrusted.gypi into ppapi_cpp and ppapi_tests which are the places where we actually need it. Since ppapi_cpp and ppapi_tests have become their own gyp files, all references to them also need to be updated. I am also working on a CL which moves the list of sources into ppapi_sources.gypi as a variable so that we can share the file list in both the trusted and untrusted versions of teh tests and ppapi_cpp library. So this CL is currently for comparison against that technique which I will upload shortly.

Patch Set 1 #

Unified diffs Side-by-side diffs Delta from patch set Stats (+161 lines, -1036 lines) Patch
M chrome/chrome_tests.gypi View 1 chunk +1 line, -1 line 0 comments Download
M gpu/demos/demos.gyp View 1 chunk +1 line, -1 line 0 comments Download
M ppapi/native_client/src/trusted/plugin/plugin.gyp View 2 chunks +2 lines, -2 lines 0 comments Download
M ppapi/ppapi.gyp View 1 chunk +1 line, -2 lines 0 comments Download
A ppapi/ppapi_c.gypi View 1 chunk +137 lines, -0 lines 0 comments Download
A + ppapi/ppapi_cpp.gyp View 2 chunks +2 lines, -131 lines 0 comments Download
D ppapi/ppapi_cpp.gypi View 1 chunk +0 lines, -463 lines 0 comments Download
M ppapi/ppapi_internal.gyp View 1 chunk +0 lines, -2 lines 0 comments Download
A + ppapi/ppapi_tests.gyp View 15 chunks +16 lines, -16 lines 0 comments Download
D ppapi/ppapi_tests.gypi View 1 chunk +0 lines, -417 lines 0 comments Download
M remoting/remoting.gyp View 1 chunk +1 line, -1 line 0 comments Download

Messages

Total messages: 4 (0 generated)
noelallen1
9 years, 1 month ago (2011-11-22 18:56:46 UTC) #1
dmichael (off chromium)
I don't quite follow the comment. Is this the solution or a workaround? It kind ...
9 years, 1 month ago (2011-11-22 19:05:23 UTC) #2
dmichael (off chromium)
Overall, looks good. Two things: 1) Your try is failing at the patch; you probably ...
9 years, 1 month ago (2011-11-22 19:57:01 UTC) #3
apatrick_chromium
9 years, 1 month ago (2011-11-22 20:06:21 UTC) #4
LGTM for gpu/ stuff.

Powered by Google App Engine
This is Rietveld 408576698