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

Issue 1256593003: Gets gn check to execute cleanly in mojo/common (Closed)

Created:
5 years, 5 months ago by sky
Modified:
5 years, 4 months ago
CC:
chromium-reviews, qsr+mojo_chromium.org, viettrungluu+watch_chromium.org, yzshen+watch_chromium.org, abarth-chromium, Aaron Boodman, piman+watch_chromium.org, darin (slow to review), ben+mojo_chromium.org
Base URL:
https://chromium.googlesource.com/chromium/src.git@master
Target Ref:
refs/pending/heads/master
Project:
chromium
Visibility:
Public.

Description

Gets gn check to execute cleanly in mojo/common This one is trickier. I'm changing mojo/common:common_base to be a source_set. Here's why. When I add the necessary deps, in particular "//third_party/mojo/src/mojo/public/cpp/bindings:bindings", then I get link errors for the environment, eg gen/third_party/mojo/src/mojo/public/interfaces/bindings/interface_control_messages.mojom.cc:719: error: undefined reference to 'mojo::Environment::GetDefaultLogger()' These symbols are in //mojo/environment. If I add //mojo/environment to the list of deps for common_base I end up with a cycle as environment depends upon common_base. By changing to source_set common_base isn't linked and everyone is happy. As a result of this I had to consolidate //mojo/environment into a single source set. BUG=none TEST=none R=ben@chromium.org Committed: https://crrev.com/67b0a7be4ff751b1cf83be5af817a61ff7154aa8 Cr-Commit-Position: refs/heads/master@{#340527}

Patch Set 1 #

Patch Set 2 : merge 2 trunk #

Patch Set 3 : fix environment and merge #

Patch Set 4 : attempt 2 #

Unified diffs Side-by-side diffs Delta from patch set Stats (+16 lines, -32 lines) Patch
M .gn View 1 1 chunk +1 line, -3 lines 0 comments Download
M mojo/common/BUILD.gn View 1 2 chunks +3 lines, -1 line 0 comments Download
M mojo/environment/BUILD.gn View 1 2 3 2 chunks +12 lines, -28 lines 0 comments Download

Messages

Total messages: 7 (1 generated)
sky
5 years, 4 months ago (2015-07-27 16:15:46 UTC) #1
Ben Goodger (Google)
lgtm
5 years, 4 months ago (2015-07-27 17:58:26 UTC) #2
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1256593003/60001 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1256593003/60001
5 years, 4 months ago (2015-07-27 19:14:14 UTC) #4
commit-bot: I haz the power
Committed patchset #4 (id:60001)
5 years, 4 months ago (2015-07-27 19:19:53 UTC) #5
commit-bot: I haz the power
Patchset 4 (id:??) landed as https://crrev.com/67b0a7be4ff751b1cf83be5af817a61ff7154aa8 Cr-Commit-Position: refs/heads/master@{#340527}
5 years, 4 months ago (2015-07-27 19:20:52 UTC) #6
sky
5 years, 4 months ago (2015-07-27 22:20:49 UTC) #7
Message was sent while issue was closed.
A revert of this CL (patchset #4 id:60001) has been created in
https://codereview.chromium.org/1262503002/ by sky@chromium.org.

The reason for reverting is: Caused failes on the windows gn bot:
http://build.chromium.org/p/chromium.win/builders/Win8%20GN%20%28dbg%29/build...
:
485/11287] CXX obj/ui/views/views/desktop_screen_win.obj
FAILED: E:/b/depot_tools/python276_bin/python.exe gyp-win-tool link-wrapper
environment.x86 False link.exe /nologo /OUT:ipc_mojo_unittests.exe
/PDB:ipc_mojo_unittests.exe.pdb @ipc_mojo_unittests.exe.rsp
mojo.dll.lib(mojo.dll) : error LNK2005: "public: __thiscall
mojo::common::HandleWatcher::HandleWatcher(void)"
(??0HandleWatcher@common@mojo@@QAE@XZ) already defined in handle_watcher.obj

mojo.dll.lib(mojo.dll) : error LNK2005: "public: __thiscall
mojo::common::HandleWatcher::~HandleWatcher(void)"
(??1HandleWatcher@common@mojo@@QAE@XZ) already defined in handle_watcher.obj

mojo.dll.lib(mojo.dll) : error LNK2005: "public: void __thiscall
mojo::common::HandleWatcher::Start(class mojo::Handle const &,unsigned
int,unsigned __int64,class base::Callback<void __cdecl(unsigned int)> const &)"
(?Start@HandleWatcher@common@mojo@@QAEXABVHandle@3@I_KABV?$Callback@$$A6AXI@Z@base@@@Z)
already defined in handle_watcher.obj

ipc_mojo_unittests.exe : fatal error LNK1169: one or more multiply defined
symbols found.

Powered by Google App Engine
This is Rietveld 408576698