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

Issue 470523005: Move startup_helper_win.cc to separate target for incremental build (Closed)

Created:
6 years, 4 months ago by scottmg
Modified:
6 years, 4 months ago
Reviewers:
jam, sky
CC:
chromium-reviews, darin-cc_chromium.org
Project:
chromium
Visibility:
Public.

Description

Move startup_helper_win.cc to separate target for incremental build Currently, the .cc is included in multiple targets. In incremental builds this results in errors like: [609->8104/8713 ~0] LINK_EMBED unit_tests.exe FAILED: d:\src\depot_tools\python276_bin\python.exe gyp-win-tool link-with-manifests environment.x86 True unit_tests.exe "d:\src\depot_tools\python276_bin\python.exe gyp-win-tool link-wrapper environment.x86 False link.exe /nologo /OUT:unit_tests.exe @unit_tests.exe.rsp" 1 mt.exe rc.exe "obj\chrome\unit_tests.unit_tests.exe.intermediate.manifest" obj\chrome\unit_tests.unit_tests.exe.generated.manifest ..\..\build\win\compatibility.manifest content_app_both.startup_helper_win.obj : error LNK2005: "void __cdecl content::InitializeSandboxInfo(struct sandbox::SandboxInterfaceInfo *)" (?InitializeSandboxInfo@content@@YAXPAUSandboxInterfaceInfo@sandbox@@@Z) already defined in test_support_content.startup_helper_win.obj content_app_both.startup_helper_win.obj : error LNK2005: "void __cdecl `anonymous namespace'::InvalidParameter(wchar_t const *,wchar_t const *,wchar_t const *,unsigned int,unsigned int)" (?InvalidParameter@?A0xc496daa2@@YAXPB_W00II@Z) already defined in test_support_content.startup_helper_win.obj content_app_both.startup_helper_win.obj : error LNK2005: "void __cdecl `anonymous namespace'::PureCall(void)" (?PureCall@?A0xc496daa2@@YAXXZ) already defined in test_support_content.startup_helper_win.obj content_app_both.startup_helper_win.obj : error LNK2005: "void __cdecl content::RegisterInvalidParamHandler(void)" (?RegisterInvalidParamHandler@content@@YAXXZ) already defined in test_support_content.startup_helper_win.obj content_app_both.startup_helper_win.obj : error LNK2005: "void __cdecl content::SetupCRT(class base::CommandLine const &)" (?SetupCRT@content@@YAXABVCommandLine@base@@@Z) already defined in test_support_content.startup_helper_win.obj unit_tests.exe : fatal error LNK1169: one or more multiply defined symbols found when incremental_chrome_dll=1 used in Release build. By putting the .cc in a static_library target and depending on it as necessary, rather than including the .cc into multiple places, this is avoided. R=jam@chromium.org TBR=sky@chromium.org BUG=404809 Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=291256

Patch Set 1 #

Patch Set 2 : add some content_app_both deps for shared_library #

Patch Set 3 : directly for content #

Patch Set 4 : separate target #

Patch Set 5 : . #

Patch Set 6 : duplicate #

Patch Set 7 : restore exe behavior for sandbox #

Unified diffs Side-by-side diffs Delta from patch set Stats (+37 lines, -12 lines) Patch
M ash/ash.gyp View 1 2 3 4 5 2 chunks +7 lines, -1 line 0 comments Download
M chrome/chrome_exe.gypi View 1 2 3 4 5 6 1 chunk +2 lines, -0 lines 0 comments Download
M content/content.gyp View 1 2 3 4 5 6 1 chunk +20 lines, -0 lines 0 comments Download
M content/content_app.gypi View 1 2 3 4 5 3 chunks +5 lines, -7 lines 0 comments Download
M content/content_shell.gypi View 1 2 3 1 chunk +0 lines, -1 line 0 comments Download
M content/content_tests.gypi View 1 2 3 4 5 2 chunks +1 line, -1 line 0 comments Download
M ui/app_list/app_list.gyp View 1 2 3 4 5 2 chunks +1 line, -1 line 0 comments Download
M ui/views/examples/examples.gyp View 1 2 3 4 5 2 chunks +1 line, -1 line 0 comments Download

Messages

Total messages: 20 (0 generated)
scottmg
6 years, 4 months ago (2014-08-19 03:39:50 UTC) #1
jam
lgtm
6 years, 4 months ago (2014-08-19 19:49:44 UTC) #2
scottmg
The CQ bit was checked by scottmg@chromium.org
6 years, 4 months ago (2014-08-19 20:46:05 UTC) #3
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/scottmg@chromium.org/470523005/80001
6 years, 4 months ago (2014-08-19 20:47:00 UTC) #4
commit-bot: I haz the power
FYI, CQ is re-trying this CL (attempt #1). The failing builders are: win_chromium_compile_dbg on tryserver.chromium.win ...
6 years, 4 months ago (2014-08-19 22:15:30 UTC) #5
commit-bot: I haz the power
The CQ bit was unchecked by commit-bot@chromium.org
6 years, 4 months ago (2014-08-19 22:37:39 UTC) #6
commit-bot: I haz the power
Try jobs failed on following builders: win_chromium_compile_dbg on tryserver.chromium.win (http://build.chromium.org/p/tryserver.chromium.win/builders/win_chromium_compile_dbg/builds/7428)
6 years, 4 months ago (2014-08-19 22:37:39 UTC) #7
scottmg
Hm, this is a bit messy because of the shared/static difference in how the content ...
6 years, 4 months ago (2014-08-20 16:53:47 UTC) #8
jam
On 2014/08/20 16:53:47, scottmg wrote: > Hm, this is a bit messy because of the ...
6 years, 4 months ago (2014-08-20 23:28:43 UTC) #9
scottmg
On 2014/08/20 23:28:43, jam wrote: > On 2014/08/20 16:53:47, scottmg wrote: > > Hm, this ...
6 years, 4 months ago (2014-08-20 23:29:55 UTC) #10
jam
On 2014/08/20 23:29:55, scottmg wrote: > On 2014/08/20 23:28:43, jam wrote: > > On 2014/08/20 ...
6 years, 4 months ago (2014-08-21 17:23:59 UTC) #11
scottmg
On 2014/08/21 17:23:59, jam wrote: > On 2014/08/20 23:29:55, scottmg wrote: > > On 2014/08/20 ...
6 years, 4 months ago (2014-08-21 17:56:10 UTC) #12
scottmg
The CQ bit was checked by scottmg@chromium.org
6 years, 4 months ago (2014-08-21 17:56:28 UTC) #13
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/scottmg@chromium.org/470523005/240001
6 years, 4 months ago (2014-08-21 17:59:09 UTC) #14
scottmg
tbr sky for minor ui/ gyp changes
6 years, 4 months ago (2014-08-21 18:11:06 UTC) #15
scottmg
The CQ bit was unchecked by scottmg@chromium.org
6 years, 4 months ago (2014-08-21 18:11:13 UTC) #16
scottmg
The CQ bit was checked by scottmg@chromium.org
6 years, 4 months ago (2014-08-21 18:11:15 UTC) #17
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/scottmg@chromium.org/470523005/240001
6 years, 4 months ago (2014-08-21 18:13:57 UTC) #18
jam
still lgtm
6 years, 4 months ago (2014-08-21 21:22:45 UTC) #19
commit-bot: I haz the power
6 years, 4 months ago (2014-08-22 00:06:26 UTC) #20
Message was sent while issue was closed.
Committed patchset #7 (240001) as 291256

Powered by Google App Engine
This is Rietveld 408576698