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

Issue 1633343002: Move the mini_installer_version rule to its own gyp file. (Closed)

Created:
4 years, 11 months ago by Sébastien Marchand
Modified:
4 years, 11 months ago
CC:
chromium-reviews, grt+watch_chromium.org, wfh+watch_chromium.org, syzygy-team_chromium.org, chrisha, huangs
Base URL:
https://chromium.googlesource.com/chromium/src.git@master
Target Ref:
refs/pending/heads/master
Project:
chromium
Visibility:
Public.

Description

Move the mini_installer_version rule to its own gyp file. Having this rule defined in mini_installer.gypi cause the following warning: warning: multiple rules generate mini_installer_exe_version.rc. builds involving this target will not be correct This is because this .gypi gets included both by mini_installer.gyp and by mini_installer_syzygy.gypi. So these 2 targets declare 'mini_installer_exe_version.rc' as one of their output, and for some reason the _syzygy one win and becomes the owner of this file. This creates the following dependencies (from bottom to top): syzygy/chrome.dll.pdb stamp obj/chrome/chrome_dll_syzygy.actions_rules_copies.stamp stamp obj/chrome/installer/mini_installer_syzygy.actions_depends.stamp mini_installer_syzygy_target_mini_installer_version_71edb9637c223314ee6152f2a3daf553 mini_installer_exe_version.rc rc stamp obj/chrome/installer/mini_installer.mini_installer_exe_version.res obj/chrome/installer/mini_installer.actions_rules_copies.stamp link_embed rc cxx cxx cxx cxx rc cxx cxx cxx cxx mini_installer.exe stamp obj/build/chrome_official_builder_no_unittests.actions_depends.stamp stamp obj/build/chrome_official_builder.actions_depends.stamp chrome_official_builder Equivalent to (-> = "depends on"): chrome_official_builder -> mini_installer.exe -> mini_installer_exe_version.rc -> mini_installer_syzygy -> chrome_dll_syzygy Having this kind of dependency between mini_installer and the syzygy target cause some important build failures on the official builder. Defining this target in a new gyp file (instead of in a gypi file) fix this redefinition issue (i.e. both targets still depends on it but they don't define it). TBR=gab@chromium.org, grt@chromium.org BUG=581525 Committed: https://crrev.com/a0ad68e81c795be1fbf4f5125c3dd4fc0d3f918f Cr-Commit-Position: refs/heads/master@{#371746}

Patch Set 1 #

Patch Set 2 : Fix the mini_installer_version target #

Patch Set 3 : Fix the mini_installer_version target #

Unified diffs Side-by-side diffs Delta from patch set Stats (+55 lines, -36 lines) Patch
M chrome/installer/mini_installer.gyp View 1 chunk +0 lines, -4 lines 0 comments Download
M chrome/installer/mini_installer.gypi View 1 2 3 chunks +2 lines, -28 lines 0 comments Download
M chrome/installer/mini_installer_syzygy.gyp View 1 chunk +0 lines, -4 lines 0 comments Download
A chrome/installer/mini_installer_version.gyp View 1 1 chunk +53 lines, -0 lines 0 comments Download

Messages

Total messages: 20 (10 generated)
scottmg
lg enough to me to tbr grt to get it landed tonight :)
4 years, 11 months ago (2016-01-27 00:46:55 UTC) #2
scottmg
A little more description in the description would be good.
4 years, 11 months ago (2016-01-27 00:47:14 UTC) #3
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1633343002/1 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1633343002/1
4 years, 11 months ago (2016-01-27 01:33:29 UTC) #9
commit-bot: I haz the power
Try jobs failed on following builders: win_chromium_x64_rel_ng on tryserver.chromium.win (JOB_FAILED, http://build.chromium.org/p/tryserver.chromium.win/builders/win_chromium_x64_rel_ng/builds/159537)
4 years, 11 months ago (2016-01-27 01:49:02 UTC) #11
scottmg
Another attempt here https://codereview.chromium.org/1633143004/ because I can't upload to this issue.
4 years, 11 months ago (2016-01-27 02:04:54 UTC) #12
scottmg
no such luck, going back to the first attempt.
4 years, 11 months ago (2016-01-27 02:25:54 UTC) #13
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1633343002/40001 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1633343002/40001
4 years, 11 months ago (2016-01-27 05:39:29 UTC) #15
commit-bot: I haz the power
Committed patchset #3 (id:40001)
4 years, 11 months ago (2016-01-27 06:05:01 UTC) #17
commit-bot: I haz the power
Patchset 3 (id:??) landed as https://crrev.com/a0ad68e81c795be1fbf4f5125c3dd4fc0d3f918f Cr-Commit-Position: refs/heads/master@{#371746}
4 years, 11 months ago (2016-01-27 06:05:55 UTC) #19
grt (UTC plus 2)
4 years, 11 months ago (2016-01-27 16:15:34 UTC) #20
Message was sent while issue was closed.
nothing obvious jumps out at me, so LGTM if it works.

Powered by Google App Engine
This is Rietveld 408576698