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

Issue 1351593002: Rolling deps, making mojo work with new NaCl gn setup. (Closed)

Created:
5 years, 3 months ago by Sean Klein
Modified:
5 years, 3 months ago
CC:
mojo-reviews_chromium.org, gregsimon, qsr+mojo_chromium.org, viettrungluu+watch_chromium.org, yzshen+watch_chromium.org, abarth-chromium, Aaron Boodman, darin (slow to review), ben+mojo_chromium.org
Base URL:
https://github.com/domokit/mojo.git@master
Target Ref:
refs/heads/master
Project:
mojo
Visibility:
Public.

Description

Rolling deps, making mojo work with new NaCl gn setup. The NaCl repository has moved a lot of its BUILD.gn files to new locations, largely to work with Chromium. This CL updates Mojo in parallel with Chromium by updating relevant build files such that NaCl can still be built. All files in "build/*" are directly copied from Chromium except for two: "build/toolchain/gcc_toolchain.gni" could not totally be copied (the Chromium version uses sanitizers, and they differ in how they deal with .so files). I hand-copied chunks of this file to build with the new NaCl setup (copying the entire file is not possible without causing errors). "build/toolchain/nacl_toolchain.gni" removed an assignment of "clear_sanitizers = true" from the nacl_toolchain template, as it was unused in Mojo. This is just a single line difference. BUG=https://github.com/domokit/mojo/issues/396 R=mseaborn@chromium.org Committed: https://chromium.googlesource.com/external/mojo/+/51c54bcfb4e774dc752e4c3d26f5862430861802

Patch Set 1 #

Patch Set 2 : #

Patch Set 3 : Resolving merge conflict in DEPS #

Unified diffs Side-by-side diffs Delta from patch set Stats (+393 lines, -71 lines) Patch
M DEPS View 1 2 1 chunk +1 line, -1 line 0 comments Download
A build/config/nacl/BUILD.gn View 1 chunk +81 lines, -0 lines 0 comments Download
M build/toolchain/gcc_toolchain.gni View 1 7 chunks +36 lines, -14 lines 0 comments Download
M build/toolchain/nacl/BUILD.gn View 1 chunk +175 lines, -50 lines 0 comments Download
A build/toolchain/nacl_toolchain.gni View 1 chunk +52 lines, -0 lines 0 comments Download
A build/toolchain/toolchain.gni View 1 chunk +40 lines, -0 lines 0 comments Download
M mojo/nacl/BUILD.gn View 2 chunks +4 lines, -3 lines 0 comments Download
M nacl_bindings/BUILD.gn View 2 chunks +2 lines, -2 lines 0 comments Download
M services/nacl/BUILD.gn View 1 chunk +2 lines, -1 line 0 comments Download

Messages

Total messages: 8 (2 generated)
Sean Klein
5 years, 3 months ago (2015-09-17 15:39:34 UTC) #2
Sean Klein
Trybot failures should be gone once https://codereview.chromium.org/1346773002/ lands
5 years, 3 months ago (2015-09-17 15:40:23 UTC) #4
Mark Seaborn
LGTM I assume that the build/ files are copied across from Chromium without modification?
5 years, 3 months ago (2015-09-17 19:11:57 UTC) #5
Sean Klein
On 2015/09/17 19:11:57, Mark Seaborn wrote: > LGTM > > I assume that the build/ ...
5 years, 3 months ago (2015-09-17 20:19:47 UTC) #6
Mark Seaborn
On 17 September 2015 at 13:19, <smklein@chromium.org> wrote: > On 2015/09/17 19:11:57, Mark Seaborn wrote: ...
5 years, 3 months ago (2015-09-17 20:44:57 UTC) #7
Sean Klein
5 years, 3 months ago (2015-09-17 22:51:37 UTC) #8
Message was sent while issue was closed.
Committed patchset #3 (id:40001) manually as
51c54bcfb4e774dc752e4c3d26f5862430861802 (presubmit successful).

Powered by Google App Engine
This is Rietveld 408576698