backout Bug 1174206 (3e53a0aae914 and 6b992274233a) for gecko decision task route conflict

MozReview-Commit-ID: 3PrHGAqtpLj

mobile/android/config/tooltool-manifests/android-x86/releng.manifest

@@ -60,13 +60,5 @@
 "unpack": true,
 "digest": "5ebf4c34e43faba54d189156a1d590f1e99775d1004f18cb7619d9975a5c2bd252021e470abd82bceb28580c1a22dd5501320062a0d83b5588b84633ac30c494",
 "size": 51936348
-},
-{
-"size": 30899096,
-"visibility": "public",
-"digest": "ac9f5f95d11580d3dbeff87e80a585fe4d324b270dabb91b1165686acab47d99fa6651074ab0be09420239a5d6af38bb2c539506962a7b44e0ed4d080bba2953",
-"algorithm": "sha512",
-"filename": "java_home-1.7.0-openjdk-1.7.0.85.x86_64.tar.xz",
-"unpack": true
 }
 ]

taskcluster/ci/legacy/tasks/branches/base_job_flags.yml

@@ -17,7 +17,6 @@ flags:
     - android-api-15
     - android-api-15-frontend
     - android-partner-sample1
-    - android-x86
     - linux
     - linux-l10n    # Desktop l10n
     - linux64

taskcluster/ci/legacy/tasks/branches/try/job_flags.yml

@@ -25,12 +25,6 @@ builds:
     types:
       opt:
         task: tasks/builds/android_api_15_partner_sample1.yml
-  android-x86:
-    platforms:
-      - Android
-    types:
-      opt:
-        task: tasks/builds/android_x86.yml
   linux:
     platforms:
       - Linux

taskcluster/ci/legacy/tasks/builds/android_x86.yml

@@ -1,64 +0,0 @@
-$inherits:
-  from: 'tasks/builds/mobile_base.yml'
-  variables:
-    build_name: 'android'
-    build_type: 'opt'
-task:
-  metadata:
-      name: '[TC] Android x86'
-      description: 'Android x86'
-
-  workerType: android-api-15
-
-  routes:
-    - 'index.buildbot.branches.{{project}}.android-x86'
-    - 'index.buildbot.revisions.{{head_rev}}.{{project}}.android-x86'
-
-  scopes:
-    - 'docker-worker:cache:level-{{level}}-{{project}}-build-android-x86-workspace'
-    - 'docker-worker:cache:tooltool-cache'
-    - 'docker-worker:relengapi-proxy:tooltool.download.internal'
-    - 'docker-worker:relengapi-proxy:tooltool.download.public'
-
-  payload:
-    cache:
-      level-{{level}}-{{project}}-build-android-x86-workspace: '/home/worker/workspace'
-      tooltool-cache: '/home/worker/tooltool-cache'
-
-    features:
-      relengAPIProxy: true
-
-    env:
-      # inputs to mozharness
-      MOZHARNESS_SCRIPT: 'mozharness/scripts/fx_desktop_build.py'
-      # TODO: make these additional configuration files go away
-      MOZHARNESS_CONFIG: >
-          builds/releng_base_android_64_builds.py
-          disable_signing.py
-          platform_supports_post_upload_to_latest.py
-      MOZHARNESS_ACTIONS: "get-secrets build multi-l10n update"
-      MH_CUSTOM_BUILD_VARIANT_CFG: x86
-      MH_BRANCH: {{project}}
-      MH_BUILD_POOL: taskcluster
-
-    command: ["/bin/bash", "bin/build.sh"]
-
-  extra:
-    treeherderEnv:
-      - production
-      - staging
-    treeherder:
-      machine:
-        # see https://github.com/mozilla/treeherder/blob/master/ui/js/values.js
-        platform: android-4-2-x86
-      groupSymbol: tc
-      groupName: Submitted by taskcluster
-      symbol: B
-      tier: 2
-    # Rather then enforcing particular conventions we require that all build
-    # tasks provide the "build" extra field to specify where the build and tests
-    # files are located.
-    locations:
-      build: 'public/build/target.apk'
-      mozharness: 'public/build/mozharness.zip'
-      test_packages: 'public/build/target.test_packages.json'