From c1f948c75f0f3dd549318e7372d1dc850d884e54 Mon Sep 17 00:00:00 2001
From: Andreea Pavel <apavel@mozilla.com>
Date: Fri, 22 Mar 2019 12:09:57 +0200
Subject: [PATCH] Backed out 2 changesets (bug 1527463) for bustages a=backout

Backed out changeset 74b3bf36f5e8 (bug 1527463)
Backed out changeset 235af3330b73 (bug 1527463)
---
 build/mozconfig.artifact         |  6 +---
 taskcluster/ci/build/windows.yml | 57 +++-----------------------------
 2 files changed, 5 insertions(+), 58 deletions(-)

diff --git a/build/mozconfig.artifact b/build/mozconfig.artifact
index 2b1f19265730..8a4d72571449 100644
--- a/build/mozconfig.artifact
+++ b/build/mozconfig.artifact
@@ -2,10 +2,6 @@
 
 # Enable the artifact build.
 ac_add_options --enable-artifact-builds
-if test -n "$MOZ_ARTIFACT_TASK_WIN32_OPT"; then
-  ac_add_options --enable-artifact-build-symbols=full
-else
-  ac_add_options --enable-artifact-build-symbols
-fi
+ac_add_options --enable-artifact-build-symbols
 
 . "$topsrcdir/build/mozconfig.no-compile"
diff --git a/taskcluster/ci/build/windows.yml b/taskcluster/ci/build/windows.yml
index b261a3b8117f..19aa16a56b2d 100755
--- a/taskcluster/ci/build/windows.yml
+++ b/taskcluster/ci/build/windows.yml
@@ -1080,46 +1080,6 @@ win64-aarch64-eme/opt:
     toolchains:
         - win64-node
 
-win64-aarch64-nightly-no-eme/opt:
-    description: "AArch64 Win64 Nightly w/o EME"
-    index:
-        product: firefox
-        job-name: win64-aarch64-no-eme-opt
-        type: nightly
-    attributes:
-        enable-full-crashsymbols: true
-    shipping-phase: build
-    shipping-product: firefox
-    treeherder:
-        platform: windows2012-aarch64/opt
-        symbol: Nn
-        tier: 1
-    worker-type: aws-provisioner-v1/gecko-{level}-b-win2012
-    worker:
-        max-run-time: 7200
-        env:
-            TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/aarch64.manifest"
-            PERFHERDER_EXTRA_OPTIONS: aarch64-no-eme
-    run:
-        actions: [get-secrets, build]
-        options: [append-env-variables-from-configs]
-        script: mozharness/scripts/fx_desktop_build.py
-        secrets: true
-        config:
-            - builds/releng_base_firefox.py
-            - builds/taskcluster_base_windows.py
-            - taskcluster_nightly.py
-        extra-config:
-            stage_platform: win64-aarch64
-            mozconfig_platform: win64-aarch64
-    run-on-projects: []
-    toolchains:
-        - win64-clang-cl
-        - win64-aarch64-rust
-        - win64-cbindgen
-        - win64-nasm
-        - win64-node
-
 win64-aarch64-nightly/opt:
     description: "AArch64 Win64 Nightly"
     index:
@@ -1141,9 +1101,6 @@ win64-aarch64-nightly/opt:
         env:
             TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/win64/aarch64.manifest"
             PERFHERDER_EXTRA_OPTIONS: aarch64
-            MOZ_ARTIFACT_TASK: {task-reference: '<win64-aarch64-opt>'}
-            MOZ_ARTIFACT_TASK_WIN32_OPT: {task-reference: '<win32-opt>'}
-            USE_ARTIFACT: '1'
     run:
         actions: [get-secrets, build]
         options: [append-env-variables-from-configs]
@@ -1156,17 +1113,11 @@ win64-aarch64-nightly/opt:
         extra-config:
             stage_platform: win64-aarch64
             mozconfig_platform: win64-aarch64
-    dependencies:
-        win32-opt: build-win32-nightly/opt
-        win64-aarch64-opt: build-win64-aarch64-nightly-no-eme/opt
-    fetches:
-        # Abuse fetches to copy the generated-files artifact from the non-eme
-        # build directly to the artifacts directory of this build.
-        win64-aarch64-opt:
-            - artifact: target.generated-files.tar.gz
-              extract: false
-              dest: ../public/build
     toolchains:
+        - win64-clang-cl
+        - win64-aarch64-rust
+        - win64-cbindgen
+        - win64-nasm
         - win64-node