From b1ac48eee76c4ee437ae006e0366d80434f9090c Mon Sep 17 00:00:00 2001
From: Rob Lemley <rob@thunderbird.net>
Date: Sun, 8 Mar 2020 21:21:01 -0400
Subject: [PATCH] Bug 1620888 - Port bug 1620165: Sync win64-cross build job
 with Firefox. r=darktrojan

--HG--
extra : rebase_source : 059af60ef2aa9d3d79d59144621031c682fe2dc3
extra : histedit_source : b2b8d0d3cff566f853291e77c2200873357208c5
---
 mail/config/mozconfigs/win64/common-win64 |  2 +-
 mail/config/mozconfigs/win64/nightly      |  1 -
 taskcluster/ci/build/windows-cross.yml    | 18 +++++++++++-------
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/mail/config/mozconfigs/win64/common-win64 b/mail/config/mozconfigs/win64/common-win64
index 2cfb57a81b..5e2379f7c7 100644
--- a/mail/config/mozconfigs/win64/common-win64
+++ b/mail/config/mozconfigs/win64/common-win64
@@ -6,7 +6,7 @@ if test -z "$USE_ARTIFACT"; then
 . $topsrcdir/build/win64/mozconfig.vs-latest
 
 # Set up mapi includes (must be done after visual studio setup)
-export INCLUDE=$INCLUDE:${TOOLTOOL_DIR}/mapiheader
+export INCLUDE=${TOOLTOOL_DIR}/mapiheader
 fi
 
 if test `uname -s` = Linux; then
diff --git a/mail/config/mozconfigs/win64/nightly b/mail/config/mozconfigs/win64/nightly
index 3e99837c5c..ba531ded16 100644
--- a/mail/config/mozconfigs/win64/nightly
+++ b/mail/config/mozconfigs/win64/nightly
@@ -4,7 +4,6 @@
 . "$topsrcdir/build/mozconfig.stylo"
 . "$topsrcdir/comm/mail/config/mozconfigs/common"
 . "$topsrcdir/comm/mail/config/mozconfigs/win64/common-win64"
-. "$topsrcdir/comm/mail/config/mozconfigs/win64/cross"
 
 ac_add_options --enable-update-channel="${MOZ_UPDATE_CHANNEL}"
 ac_add_options --enable-profiling
diff --git a/taskcluster/ci/build/windows-cross.yml b/taskcluster/ci/build/windows-cross.yml
index 4722d4038f..cf7890afd8 100644
--- a/taskcluster/ci/build/windows-cross.yml
+++ b/taskcluster/ci/build/windows-cross.yml
@@ -17,6 +17,9 @@ win64-cross/opt:
     index:
         product: thunderbird
         job-name: win64-cross-opt
+    attributes:
+            enable-build-signing: true
+            enable-full-crashsymbols: true
     treeherder:
         platform: windows2012-64/opt
         symbol: Bx
@@ -28,6 +31,7 @@ win64-cross/opt:
         env:
             PERFHERDER_EXTRA_OPTIONS: cross
             TOOLTOOL_MANIFEST: "comm/mail/config/tooltool-manifests/win64/releng.manifest"
+            # MOZ_AUTOMATION_PACKAGE_TESTS: "1"
     run:
         actions: [build]
         options: [append-env-variables-from-configs]
@@ -36,18 +40,15 @@ win64-cross/opt:
             - builds/taskcluster_base_thunderbird.py
             - builds/releng_base_linux_64_builds.py
         extra-config:
-            disable_package_metrics: true
+            stage_platform: win64
             mozconfig_platform: win64
             env:
-                # Setting LD_PRELOAD at the worker level would set it during
-                # fetch-content, which can fail randomly when a tar/unzip subprocess
-                # of fetch-content starts while the library is being extracted by
-                # another.
                 LD_PRELOAD: "/builds/worker/fetches/liblowercase/liblowercase.so"
-                LOWERCASE_DIRS: "/builds/worker/workspace/build/src/vs2017_15.8.4/:/builds/worker/workspace/build/src/mapiheader/"
-    run-on-projects: ['try']
+                LOWERCASE_DIRS: "/builds/worker/checkouts/gecko/vs2017_15.8.4:/builds/worker/checkouts/gecko/mapiheader"
+    run-on-projects: ['try-comm-central']
     dependencies:
         win64-clang-cl: toolchain-win64-clang-cl
+        thirdparty-libotr-win64: thirdparty-libotr-win64
     fetches:
         toolchain:
             - linux64-binutils
@@ -58,6 +59,7 @@ win64-cross/opt:
             - linux64-nasm
             - linux64-node
             - linux64-rust-cross-1.41
+            - linux64-rust-size
             - linux64-sccache
             - linux64-wine
         fetch:
@@ -67,3 +69,5 @@ win64-cross/opt:
             - artifact: clang.tar.bz2
               extract: true
               dest: clang-cl
+        thirdparty-libotr-win64:
+            - libotr.tar.xz