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

Issue 8727029: Avoid references to untrusted.gypi in WebKit (Closed)

Created:
9 years ago by noelallen1
Modified:
9 years ago
CC:
chromium-reviews
Visibility:
Public.

Description

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 Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=112495

Patch Set 1 #

Patch Set 2 : '' #

Patch Set 3 : '' #

Patch Set 4 : '' #

Patch Set 5 : '' #

Patch Set 6 : '' #

Patch Set 7 : '' #

Total comments: 1

Patch Set 8 : '' #

Patch Set 9 : '' #

Unified diffs Side-by-side diffs Delta from patch set Stats (+467 lines, -566 lines) Patch
M chrome/chrome_tests.gypi View 1 2 3 4 5 6 7 8 1 chunk +1 line, -1 line 0 comments Download
M ppapi/native_client/src/shared/ppapi/nacl.scons View 1 2 3 4 5 6 7 8 1 chunk +8 lines, -4 lines 0 comments Download
M ppapi/ppapi.gyp View 1 2 3 4 5 6 7 8 1 chunk +1 line, -1 line 0 comments Download
M ppapi/ppapi_cpp.gypi View 1 2 3 4 5 6 7 8 5 chunks +8 lines, -384 lines 0 comments Download
M ppapi/ppapi_internal.gyp View 1 2 3 4 5 6 7 8 1 chunk +1 line, -1 line 0 comments Download
A ppapi/ppapi_sources.gypi View 1 2 3 4 5 6 7 1 chunk +379 lines, -0 lines 0 comments Download
M ppapi/ppapi_tests.gypi View 1 2 3 4 5 6 7 8 2 chunks +2 lines, -175 lines 0 comments Download
A ppapi/ppapi_untrusted.gyp View 1 2 3 1 chunk +67 lines, -0 lines 0 comments Download

Messages

Total messages: 1 (0 generated)
dmichael (off chromium)
9 years ago (2011-12-01 17:26:00 UTC) #1
LGTM, but I'd like to make sure bradnelson is okay with using eval from scons.
Also...  your linux try failed at the compile stage, but it looks like it might
have been a flake; you should try it again.

http://codereview.chromium.org/8727029/diff/11001/ppapi/native_client/src/sha...
File ppapi/native_client/src/shared/ppapi/nacl.scons (right):

http://codereview.chromium.org/8727029/diff/11001/ppapi/native_client/src/sha...
ppapi/native_client/src/shared/ppapi/nacl.scons:24: ppapi_sources_list =
eval(ppapi_sources_gypi)['variables']['cpp_sources']
I'd feel more comfortable if bradnelson looked at this.

Powered by Google App Engine
This is Rietveld 408576698