Commit 7577d9ed authored by zijiehe's avatar zijiehe Committed by Commit bot
Browse files

Reland of [Chromoting] Disable building 64bit chromoting.msi file. (patchset...

Reland of [Chromoting] Disable building 64bit chromoting.msi file. (patchset #1 id:1 of https://codereview.chromium.org/2088363002/ )

Reason for revert:
Try to reproduce the build break.

Original issue's description:
> Revert of [Chromoting] Disable building 64bit chromoting.msi file. (patchset #2 id:60001 of https://codereview.chromium.org/2073943002/ )
>
> Reason for revert:
> Breaks the build: https://bugs.chromium.org/p/chromium/issues/detail?id=622443
>
> Original issue's description:
> > [Chromoting] Disable building 64bit chromoting.msi file.
> >
> > A recent bug http://crbug.com/613001 has been reported by AJ, which is due to a
> > bad signing parameter we are using. It causes the 64 bit signed MSI file won't
> > be able to execute correctly in curtain mode.
> > Since we do not release 64bit msi, we should not spend time to build it.
> >
> > BUG=
> >
> > Committed: https://crrev.com/b4ed437b70ea66dc21fc7aaf856d9524e24a02b3
> > Cr-Commit-Position: refs/heads/master@{#401031}
>
> TBR=joedow@chromium.org,zijiehe@chromium.org
> # Not skipping CQ checks because original CL landed more than 1 days ago.
> BUG=
> NOTRY=true
>
> Committed: https://crrev.com/10868cf662bacfbb13b376c8baf3858ea7286528
> Cr-Commit-Position: refs/heads/master@{#401487}

TBR=joedow@chromium.org,dgozman@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=

Review-Url: https://codereview.chromium.org/2090873002
Cr-Commit-Position: refs/heads/master@{#402315}
parent 6a57db90
......@@ -1159,33 +1159,36 @@ if (enable_me2me_host) {
}
if (is_win && is_chrome_branded) {
# We do not release a 64 bits binary. So to avoid any potential
# misunderstanding, we only build 32 bits MSI file.
if (target_cpu == "x86") {
# The script uses "ia32" instead of "x86".
msi_script_arch = "ia32"
} else {
msi_script_arch = target_cpu
}
# GYP version: remoting/remoting_host_win.gyp:remoting_host_installation
action("remoting_host_installation") {
deps = [
"//remoting/host:remoting_me2me_host_archive",
]
script = "../tools/zip2msi.py"
outputs = [
"$root_out_dir/chromoting.msi",
]
args = [
"--wix_path",
rebase_path("//third_party/wix"),
"--intermediate_dir",
rebase_path("$root_gen_dir/installation", root_build_dir),
"--target_arch",
msi_script_arch,
rebase_path("$root_out_dir/remoting-me2me-host-$current_os.zip",
root_build_dir),
rebase_path(outputs[0], root_build_dir),
]
# GYP version: remoting/remoting_host_win.gyp:remoting_host_installation
action("remoting_host_installation") {
deps = [
"//remoting/host:remoting_me2me_host_archive",
]
script = "../tools/zip2msi.py"
outputs = [
"$root_out_dir/chromoting.msi",
]
args = [
"--wix_path",
rebase_path("//third_party/wix"),
"--intermediate_dir",
rebase_path("$root_gen_dir/installation", root_build_dir),
"--target_arch",
msi_script_arch,
rebase_path("$root_out_dir/remoting-me2me-host-$current_os.zip",
root_build_dir),
rebase_path(outputs[0], root_build_dir),
]
}
} else {
group("remoting_host_installation") {
}
}
}
}
......@@ -563,7 +563,9 @@
# component build is used the produced installation will not work due to
# missing DLLs. We build it anyway to make sure the GYP scripts are executed
# by the bots.
['wix_exists == "True"', {
# We do not release a 64 bits binary. So to avoid any potential
# misunderstanding, we only build 32 bits MSI file.
['wix_exists == "True" and target_arch == "ia32"', {
'targets': [
{
'target_name': 'remoting_host_installation',
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment