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

Issue 1262503002: Revert of Gets gn check to execute cleanly in mojo/common (Closed)

Created:
5 years, 4 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

Revert of Gets gn check to execute cleanly in mojo/common (patchset #4 id:60001 of https://codereview.chromium.org/1256593003/) Reason for revert: Caused failes on the windows gn bot: http://build.chromium.org/p/chromium.win/builders/Win8%20GN%20%28dbg%29/builds/10109/steps/compile/logs/stdio : 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 Original issue's 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} TBR=ben@chromium.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=none Committed: https://crrev.com/393104d55ec70415c65049a83509f5d2a1ebac11 Cr-Commit-Position: refs/heads/master@{#340584}

Patch Set 1 #

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

Messages

Total messages: 4 (0 generated)
sky
Created Revert of Gets gn check to execute cleanly in mojo/common
5 years, 4 months ago (2015-07-27 22:20:50 UTC) #1
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1262503002/1 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1262503002/1
5 years, 4 months ago (2015-07-27 22:22:13 UTC) #2
commit-bot: I haz the power
Committed patchset #1 (id:1)
5 years, 4 months ago (2015-07-27 22:24:56 UTC) #3
commit-bot: I haz the power
5 years, 4 months ago (2015-07-27 22:26:14 UTC) #4
Message was sent while issue was closed.
Patchset 1 (id:??) landed as
https://crrev.com/393104d55ec70415c65049a83509f5d2a1ebac11
Cr-Commit-Position: refs/heads/master@{#340584}

Powered by Google App Engine
This is Rietveld 408576698