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

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

Created:
4 years, 11 months ago by scottmg
Modified:
4 years, 11 months ago
CC:
chromium-reviews, grt+watch_chromium.org, wfh+watch_chromium.org
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. This is sebmarchand's https://codereview.chromium.org/1633343002/ with type: none added to the new gyp target. 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, sebmarchand@chromium.org BUG=581525

Patch Set 1 #

Unified diffs Side-by-side diffs Delta from patch set Stats (+51 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 2 chunks +1 line, -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 chunk +50 lines, -0 lines 0 comments Download

Messages

Total messages: 6 (3 generated)
scottmg
4 years, 11 months ago (2016-01-27 01:57:40 UTC) #2
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1633143004/1 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1633143004/1
4 years, 11 months ago (2016-01-27 01:58:31 UTC) #4
commit-bot: I haz the power
4 years, 11 months ago (2016-01-27 02:25:29 UTC) #6
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_...)

Powered by Google App Engine
This is Rietveld 408576698