Remove SkQP bot from master

Bug: skia:
Change-Id: I0415690911a52059eaaf7f32c81b7a4c66117d5b
Reviewed-on: https://skia-review.googlesource.com/109162
Commit-Queue: Stephan Altmueller <stephana@google.com>
Reviewed-by: Eric Boren <borenet@google.com>

10 files changed, 3 insertions, 443 deletions

diff --git a/infra/bots/gen_tasks.go b/infra/bots/gen_tasks.go
index 9b36fa3b73..cf3a132a84 100644
--- a/infra/bots/gen_tasks.go
+++ b/infra/bots/gen_tasks.go
@@ -518,9 +518,6 @@ func compile(b *specs.TasksCfgBuilder, name string, parts map[string]string) str
 			pkgs = append(pkgs, pkg)
 		} else {
 			deps = append(deps, isolateCIPDAsset(b, ISOLATE_NDK_LINUX_NAME))
-			if strings.Contains(name, "SKQP") {
-				deps = append(deps, isolateCIPDAsset(b, ISOLATE_SDK_LINUX_NAME))
-			}
 		}
 	} else if strings.Contains(name, "Chromecast") {
 		pkgs = append(pkgs, b.MustGetCipdPackageFromAsset("cast_toolchain"))
diff --git a/infra/bots/jobs.json b/infra/bots/jobs.json
index b43b57c1a2..b51974450a 100644
--- a/infra/bots/jobs.json
+++ b/infra/bots/jobs.json
@@ -15,7 +15,6 @@
   "Build-Debian9-Clang-arm64-Release-Android_ASAN_Vulkan",
   "Build-Debian9-Clang-arm64-Release-Android_Vulkan",
   "Build-Debian9-Clang-gce_x86_phone-eng-Android_Framework",
-  "Build-Debian9-Clang-universal-devrel-Android_SKQP",
   "Build-Debian9-Clang-x64-Debug-Android",
   "Build-Debian9-Clang-x64-Release-Android",
   "Build-Debian9-Clang-x86-Debug",
diff --git a/infra/bots/recipe_modules/flavor/default_flavor.py b/infra/bots/recipe_modules/flavor/default_flavor.py
index c7343c7ef6..0d565e607e 100644
--- a/infra/bots/recipe_modules/flavor/default_flavor.py
+++ b/infra/bots/recipe_modules/flavor/default_flavor.py
@@ -157,62 +157,3 @@ class DefaultFlavorUtils(object):
   def cleanup_steps(self):
     """Run any device-specific cleanup steps."""
     pass
-
-  def get_branch(self):
-    """Returns the branch of the current tryjob run by querying Gerrit."""
-    # get the issue and patchset ids.
-    issue = str(self.m.properties.get('patch_issue', ''))
-    patchset = str(self.m.properties.get('patch_set', ''))
-
-    # if none are provided we assume master.
-    if not issue or not patchset:
-      return "master"
-
-    # inline python script called below.
-    script="""
-import contextlib
-import json
-import math
-import socket
-import sys
-import time
-import urllib2
-
-GERRIT_URL_TMPL = 'https://skia-review.googlesource.com/changes/%s/detail'
-RETRIES = 3
-TIMEOUT = 10
-WAIT_BASE = 10
-
-socket.setdefaulttimeout(TIMEOUT)
-issue_id = int(sys.argv[1])
-for retry in range(RETRIES):
-  try:
-    url = GERRIT_URL_TMPL % issue_id
-    with contextlib.closing(urllib2.urlopen(url, timeout=TIMEOUT)) as w:
-      # strip out the XSS prefix.
-      body = w.read().lstrip().lstrip(")]}'")
-      print json.loads(body)['branch']
-      break
-  except Exception as e:
-    print 'Failed to get branch for issue %s:' % issue_id
-    print e
-    if retry == RETRIES:
-      raise
-    waittime = WAIT_BASE * math.pow(2, retry)
-    print 'Retry in %d seconds.' % waittime
-    time.sleep(waittime)
-"""
-
-    # Make a call to Gerrit to retrieve the branch.
-    branch = self.m.run(
-      self.m.python.inline,
-      'get branch for issue',
-      program=script,
-      args=[issue],
-      abort_on_failure=True,
-      fail_build_on_failure=True,
-      infra_step=True,
-      stdout=self.m.raw_io.output()).stdout
-    # Use the last line of the output since it will contain the branch name.
-    branch = [x.strip() for x in branch.splitlines()][-1]
-    return branch or 'master'
diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-Clang-universal-devrel-Android_SKQP_dev_branch.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-Clang-universal-devrel-Android_SKQP_dev_branch.json
deleted file mode 100644
index 833f038427..0000000000
--- a/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-Clang-universal-devrel-Android_SKQP_dev_branch.json
+++ /dev/null
@@ -1,90 +0,0 @@
-[
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "[CUSTOM_/_B_WORK]/skia/bin/fetch-gn"
-    ],
-    "cwd": "[CUSTOM_/_B_WORK]/skia",
-    "env": {
-      "BUILDTYPE": "devrel",
-      "CHROME_HEADLESS": "1",
-      "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
-      "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-universal-devrel-Android_SKQP_dev_branch"
-    },
-    "infra_step": true,
-    "name": "fetch-gn"
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "\nimport contextlib\nimport json\nimport math\nimport socket\nimport sys\nimport time\nimport urllib2\n\nGERRIT_URL_TMPL = 'https://skia-review.googlesource.com/changes/%s/detail'\nRETRIES = 3\nTIMEOUT = 10\nWAIT_BASE = 10\n\nsocket.setdefaulttimeout(TIMEOUT)\nissue_id = int(sys.argv[1])\nfor retry in range(RETRIES):\n  try:\n    url = GERRIT_URL_TMPL % issue_id\n    with contextlib.closing(urllib2.urlopen(url, timeout=TIMEOUT)) as w:\n      # strip out the XSS prefix.\n      body = w.read().lstrip().lstrip(\")]}'\")\n      print json.loads(body)['branch']\n      break\n  except Exception as e:\n    print 'Failed to get branch for issue %s:' % issue_id\n    print e\n    if retry == RETRIES:\n      raise\n    waittime = WAIT_BASE * math.pow(2, retry)\n    print 'Retry in %d seconds.' % waittime\n    time.sleep(waittime)\n",
-      "12345"
-    ],
-    "env": {
-      "BUILDTYPE": "devrel",
-      "CHROME_HEADLESS": "1",
-      "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
-      "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-universal-devrel-Android_SKQP_dev_branch"
-    },
-    "infra_step": true,
-    "name": "get branch for issue",
-    "stdout": "/path/to/tmp/",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@python.inline@@@@",
-      "@@@STEP_LOG_LINE@python.inline@import contextlib@@@",
-      "@@@STEP_LOG_LINE@python.inline@import json@@@",
-      "@@@STEP_LOG_LINE@python.inline@import math@@@",
-      "@@@STEP_LOG_LINE@python.inline@import socket@@@",
-      "@@@STEP_LOG_LINE@python.inline@import sys@@@",
-      "@@@STEP_LOG_LINE@python.inline@import time@@@",
-      "@@@STEP_LOG_LINE@python.inline@import urllib2@@@",
-      "@@@STEP_LOG_LINE@python.inline@@@@",
-      "@@@STEP_LOG_LINE@python.inline@GERRIT_URL_TMPL = 'https://skia-review.googlesource.com/changes/%s/detail'@@@",
-      "@@@STEP_LOG_LINE@python.inline@RETRIES = 3@@@",
-      "@@@STEP_LOG_LINE@python.inline@TIMEOUT = 10@@@",
-      "@@@STEP_LOG_LINE@python.inline@WAIT_BASE = 10@@@",
-      "@@@STEP_LOG_LINE@python.inline@@@@",
-      "@@@STEP_LOG_LINE@python.inline@socket.setdefaulttimeout(TIMEOUT)@@@",
-      "@@@STEP_LOG_LINE@python.inline@issue_id = int(sys.argv[1])@@@",
-      "@@@STEP_LOG_LINE@python.inline@for retry in range(RETRIES):@@@",
-      "@@@STEP_LOG_LINE@python.inline@  try:@@@",
-      "@@@STEP_LOG_LINE@python.inline@    url = GERRIT_URL_TMPL % issue_id@@@",
-      "@@@STEP_LOG_LINE@python.inline@    with contextlib.closing(urllib2.urlopen(url, timeout=TIMEOUT)) as w:@@@",
-      "@@@STEP_LOG_LINE@python.inline@      # strip out the XSS prefix.@@@",
-      "@@@STEP_LOG_LINE@python.inline@      body = w.read().lstrip().lstrip(\")]}'\")@@@",
-      "@@@STEP_LOG_LINE@python.inline@      print json.loads(body)['branch']@@@",
-      "@@@STEP_LOG_LINE@python.inline@      break@@@",
-      "@@@STEP_LOG_LINE@python.inline@  except Exception as e:@@@",
-      "@@@STEP_LOG_LINE@python.inline@    print 'Failed to get branch for issue %s:' % issue_id@@@",
-      "@@@STEP_LOG_LINE@python.inline@    print e@@@",
-      "@@@STEP_LOG_LINE@python.inline@    if retry == RETRIES:@@@",
-      "@@@STEP_LOG_LINE@python.inline@      raise@@@",
-      "@@@STEP_LOG_LINE@python.inline@    waittime = WAIT_BASE * math.pow(2, retry)@@@",
-      "@@@STEP_LOG_LINE@python.inline@    print 'Retry in %d seconds.' % waittime@@@",
-      "@@@STEP_LOG_LINE@python.inline@    time.sleep(waittime)@@@",
-      "@@@STEP_LOG_END@python.inline@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "[CUSTOM_/_B_WORK]/skia/tools/skqp/make_universal_apk"
-    ],
-    "cwd": "[CUSTOM_/_B_WORK]/skia",
-    "env": {
-      "ANDROID_HOME": "[START_DIR]/android_sdk_linux/android-sdk",
-      "ANDROID_NDK": "[START_DIR]/android_ndk_linux",
-      "BUILDTYPE": "devrel",
-      "CHROME_HEADLESS": "1",
-      "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
-      "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-universal-devrel-Android_SKQP_dev_branch"
-    },
-    "name": "make_universal"
-  },
-  {
-    "name": "$result",
-    "recipe_result": null,
-    "status_code": 0
-  }
-]
\ No newline at end of file
diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-Clang-universal-devrel-Android_SKQP_master_branch.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-Clang-universal-devrel-Android_SKQP_master_branch.json
deleted file mode 100644
index af3e20ade8..0000000000
--- a/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-Clang-universal-devrel-Android_SKQP_master_branch.json
+++ /dev/null
@@ -1,75 +0,0 @@
-[
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "[CUSTOM_/_B_WORK]/skia/bin/fetch-gn"
-    ],
-    "cwd": "[CUSTOM_/_B_WORK]/skia",
-    "env": {
-      "BUILDTYPE": "devrel",
-      "CHROME_HEADLESS": "1",
-      "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
-      "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-universal-devrel-Android_SKQP_master_branch"
-    },
-    "infra_step": true,
-    "name": "fetch-gn"
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "\nimport contextlib\nimport json\nimport math\nimport socket\nimport sys\nimport time\nimport urllib2\n\nGERRIT_URL_TMPL = 'https://skia-review.googlesource.com/changes/%s/detail'\nRETRIES = 3\nTIMEOUT = 10\nWAIT_BASE = 10\n\nsocket.setdefaulttimeout(TIMEOUT)\nissue_id = int(sys.argv[1])\nfor retry in range(RETRIES):\n  try:\n    url = GERRIT_URL_TMPL % issue_id\n    with contextlib.closing(urllib2.urlopen(url, timeout=TIMEOUT)) as w:\n      # strip out the XSS prefix.\n      body = w.read().lstrip().lstrip(\")]}'\")\n      print json.loads(body)['branch']\n      break\n  except Exception as e:\n    print 'Failed to get branch for issue %s:' % issue_id\n    print e\n    if retry == RETRIES:\n      raise\n    waittime = WAIT_BASE * math.pow(2, retry)\n    print 'Retry in %d seconds.' % waittime\n    time.sleep(waittime)\n",
-      "12345"
-    ],
-    "env": {
-      "BUILDTYPE": "devrel",
-      "CHROME_HEADLESS": "1",
-      "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
-      "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-universal-devrel-Android_SKQP_master_branch"
-    },
-    "infra_step": true,
-    "name": "get branch for issue",
-    "stdout": "/path/to/tmp/",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@python.inline@@@@",
-      "@@@STEP_LOG_LINE@python.inline@import contextlib@@@",
-      "@@@STEP_LOG_LINE@python.inline@import json@@@",
-      "@@@STEP_LOG_LINE@python.inline@import math@@@",
-      "@@@STEP_LOG_LINE@python.inline@import socket@@@",
-      "@@@STEP_LOG_LINE@python.inline@import sys@@@",
-      "@@@STEP_LOG_LINE@python.inline@import time@@@",
-      "@@@STEP_LOG_LINE@python.inline@import urllib2@@@",
-      "@@@STEP_LOG_LINE@python.inline@@@@",
-      "@@@STEP_LOG_LINE@python.inline@GERRIT_URL_TMPL = 'https://skia-review.googlesource.com/changes/%s/detail'@@@",
-      "@@@STEP_LOG_LINE@python.inline@RETRIES = 3@@@",
-      "@@@STEP_LOG_LINE@python.inline@TIMEOUT = 10@@@",
-      "@@@STEP_LOG_LINE@python.inline@WAIT_BASE = 10@@@",
-      "@@@STEP_LOG_LINE@python.inline@@@@",
-      "@@@STEP_LOG_LINE@python.inline@socket.setdefaulttimeout(TIMEOUT)@@@",
-      "@@@STEP_LOG_LINE@python.inline@issue_id = int(sys.argv[1])@@@",
-      "@@@STEP_LOG_LINE@python.inline@for retry in range(RETRIES):@@@",
-      "@@@STEP_LOG_LINE@python.inline@  try:@@@",
-      "@@@STEP_LOG_LINE@python.inline@    url = GERRIT_URL_TMPL % issue_id@@@",
-      "@@@STEP_LOG_LINE@python.inline@    with contextlib.closing(urllib2.urlopen(url, timeout=TIMEOUT)) as w:@@@",
-      "@@@STEP_LOG_LINE@python.inline@      # strip out the XSS prefix.@@@",
-      "@@@STEP_LOG_LINE@python.inline@      body = w.read().lstrip().lstrip(\")]}'\")@@@",
-      "@@@STEP_LOG_LINE@python.inline@      print json.loads(body)['branch']@@@",
-      "@@@STEP_LOG_LINE@python.inline@      break@@@",
-      "@@@STEP_LOG_LINE@python.inline@  except Exception as e:@@@",
-      "@@@STEP_LOG_LINE@python.inline@    print 'Failed to get branch for issue %s:' % issue_id@@@",
-      "@@@STEP_LOG_LINE@python.inline@    print e@@@",
-      "@@@STEP_LOG_LINE@python.inline@    if retry == RETRIES:@@@",
-      "@@@STEP_LOG_LINE@python.inline@      raise@@@",
-      "@@@STEP_LOG_LINE@python.inline@    waittime = WAIT_BASE * math.pow(2, retry)@@@",
-      "@@@STEP_LOG_LINE@python.inline@    print 'Retry in %d seconds.' % waittime@@@",
-      "@@@STEP_LOG_LINE@python.inline@    time.sleep(waittime)@@@",
-      "@@@STEP_LOG_END@python.inline@@@"
-    ]
-  },
-  {
-    "name": "$result",
-    "recipe_result": null,
-    "status_code": 0
-  }
-]
\ No newline at end of file
diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-Clang-universal-devrel-Android_SKQP_no_issue.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-Clang-universal-devrel-Android_SKQP_no_issue.json
deleted file mode 100644
index d7b157837b..0000000000
--- a/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-Clang-universal-devrel-Android_SKQP_no_issue.json
+++ /dev/null
@@ -1,23 +0,0 @@
-[
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "[CUSTOM_/_B_WORK]/skia/bin/fetch-gn"
-    ],
-    "cwd": "[CUSTOM_/_B_WORK]/skia",
-    "env": {
-      "BUILDTYPE": "devrel",
-      "CHROME_HEADLESS": "1",
-      "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
-      "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-universal-devrel-Android_SKQP_no_issue"
-    },
-    "infra_step": true,
-    "name": "fetch-gn"
-  },
-  {
-    "name": "$result",
-    "recipe_result": null,
-    "status_code": 0
-  }
-]
\ No newline at end of file
diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-Clang-universal-devrel-Android_SKQP_release_branch.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-Clang-universal-devrel-Android_SKQP_release_branch.json
deleted file mode 100644
index b5375f1f4d..0000000000
--- a/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Debian9-Clang-universal-devrel-Android_SKQP_release_branch.json
+++ /dev/null
@@ -1,90 +0,0 @@
-[
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "[CUSTOM_/_B_WORK]/skia/bin/fetch-gn"
-    ],
-    "cwd": "[CUSTOM_/_B_WORK]/skia",
-    "env": {
-      "BUILDTYPE": "devrel",
-      "CHROME_HEADLESS": "1",
-      "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
-      "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-universal-devrel-Android_SKQP_release_branch"
-    },
-    "infra_step": true,
-    "name": "fetch-gn"
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "\nimport contextlib\nimport json\nimport math\nimport socket\nimport sys\nimport time\nimport urllib2\n\nGERRIT_URL_TMPL = 'https://skia-review.googlesource.com/changes/%s/detail'\nRETRIES = 3\nTIMEOUT = 10\nWAIT_BASE = 10\n\nsocket.setdefaulttimeout(TIMEOUT)\nissue_id = int(sys.argv[1])\nfor retry in range(RETRIES):\n  try:\n    url = GERRIT_URL_TMPL % issue_id\n    with contextlib.closing(urllib2.urlopen(url, timeout=TIMEOUT)) as w:\n      # strip out the XSS prefix.\n      body = w.read().lstrip().lstrip(\")]}'\")\n      print json.loads(body)['branch']\n      break\n  except Exception as e:\n    print 'Failed to get branch for issue %s:' % issue_id\n    print e\n    if retry == RETRIES:\n      raise\n    waittime = WAIT_BASE * math.pow(2, retry)\n    print 'Retry in %d seconds.' % waittime\n    time.sleep(waittime)\n",
-      "12345"
-    ],
-    "env": {
-      "BUILDTYPE": "devrel",
-      "CHROME_HEADLESS": "1",
-      "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
-      "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-universal-devrel-Android_SKQP_release_branch"
-    },
-    "infra_step": true,
-    "name": "get branch for issue",
-    "stdout": "/path/to/tmp/",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@python.inline@@@@",
-      "@@@STEP_LOG_LINE@python.inline@import contextlib@@@",
-      "@@@STEP_LOG_LINE@python.inline@import json@@@",
-      "@@@STEP_LOG_LINE@python.inline@import math@@@",
-      "@@@STEP_LOG_LINE@python.inline@import socket@@@",
-      "@@@STEP_LOG_LINE@python.inline@import sys@@@",
-      "@@@STEP_LOG_LINE@python.inline@import time@@@",
-      "@@@STEP_LOG_LINE@python.inline@import urllib2@@@",
-      "@@@STEP_LOG_LINE@python.inline@@@@",
-      "@@@STEP_LOG_LINE@python.inline@GERRIT_URL_TMPL = 'https://skia-review.googlesource.com/changes/%s/detail'@@@",
-      "@@@STEP_LOG_LINE@python.inline@RETRIES = 3@@@",
-      "@@@STEP_LOG_LINE@python.inline@TIMEOUT = 10@@@",
-      "@@@STEP_LOG_LINE@python.inline@WAIT_BASE = 10@@@",
-      "@@@STEP_LOG_LINE@python.inline@@@@",
-      "@@@STEP_LOG_LINE@python.inline@socket.setdefaulttimeout(TIMEOUT)@@@",
-      "@@@STEP_LOG_LINE@python.inline@issue_id = int(sys.argv[1])@@@",
-      "@@@STEP_LOG_LINE@python.inline@for retry in range(RETRIES):@@@",
-      "@@@STEP_LOG_LINE@python.inline@  try:@@@",
-      "@@@STEP_LOG_LINE@python.inline@    url = GERRIT_URL_TMPL % issue_id@@@",
-      "@@@STEP_LOG_LINE@python.inline@    with contextlib.closing(urllib2.urlopen(url, timeout=TIMEOUT)) as w:@@@",
-      "@@@STEP_LOG_LINE@python.inline@      # strip out the XSS prefix.@@@",
-      "@@@STEP_LOG_LINE@python.inline@      body = w.read().lstrip().lstrip(\")]}'\")@@@",
-      "@@@STEP_LOG_LINE@python.inline@      print json.loads(body)['branch']@@@",
-      "@@@STEP_LOG_LINE@python.inline@      break@@@",
-      "@@@STEP_LOG_LINE@python.inline@  except Exception as e:@@@",
-      "@@@STEP_LOG_LINE@python.inline@    print 'Failed to get branch for issue %s:' % issue_id@@@",
-      "@@@STEP_LOG_LINE@python.inline@    print e@@@",
-      "@@@STEP_LOG_LINE@python.inline@    if retry == RETRIES:@@@",
-      "@@@STEP_LOG_LINE@python.inline@      raise@@@",
-      "@@@STEP_LOG_LINE@python.inline@    waittime = WAIT_BASE * math.pow(2, retry)@@@",
-      "@@@STEP_LOG_LINE@python.inline@    print 'Retry in %d seconds.' % waittime@@@",
-      "@@@STEP_LOG_LINE@python.inline@    time.sleep(waittime)@@@",
-      "@@@STEP_LOG_END@python.inline@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "[CUSTOM_/_B_WORK]/skia/tools/skqp/make_universal_apk"
-    ],
-    "cwd": "[CUSTOM_/_B_WORK]/skia",
-    "env": {
-      "ANDROID_HOME": "[START_DIR]/android_sdk_linux/android-sdk",
-      "ANDROID_NDK": "[START_DIR]/android_ndk_linux",
-      "BUILDTYPE": "devrel",
-      "CHROME_HEADLESS": "1",
-      "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
-      "SKIA_OUT": "[CUSTOM_/_B_WORK]/skia/out/Build-Debian9-Clang-universal-devrel-Android_SKQP_release_branch"
-    },
-    "name": "make_universal"
-  },
-  {
-    "name": "$result",
-    "recipe_result": null,
-    "status_code": 0
-  }
-]
\ No newline at end of file
diff --git a/infra/bots/recipe_modules/flavor/examples/full.py b/infra/bots/recipe_modules/flavor/examples/full.py
index e9c48327a8..6880dcb6e6 100644
--- a/infra/bots/recipe_modules/flavor/examples/full.py
+++ b/infra/bots/recipe_modules/flavor/examples/full.py
@@ -114,7 +114,7 @@ TEST_BUILDERS = [
   'Test-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-All-SafeStack',
 ]
 
-# Default properties used for TEST_BUILDERS and skqp_builders.
+# Default properties used for TEST_BUILDERS.
 defaultProps = lambda buildername: dict(
   buildername=buildername,
   repository='https://skia.googlesource.com/skia.git',
@@ -140,33 +140,6 @@ def GenTests(api):
           stdout=api.raw_io.output('192.168.1.2:5555'))
     yield test
 
-  # Test SKQP builder with different branches and issue info.
-  skqp_builders = [
-    'Build-Debian9-Clang-universal-devrel-Android_SKQP_master_branch',
-    'Build-Debian9-Clang-universal-devrel-Android_SKQP_no_issue',
-    'Build-Debian9-Clang-universal-devrel-Android_SKQP_dev_branch',
-    'Build-Debian9-Clang-universal-devrel-Android_SKQP_release_branch',
-  ]
-  for builder in skqp_builders:
-    # should we add issue information to this tests.
-    with_issue = 'no_issue' not in builder
-    props = defaultProps(builder)
-    if with_issue:
-      props.update(patch_issue=12345, patch_set=2)
-
-    test = (
-      api.test(builder) +
-      api.properties(**props)
-    )
-
-    if ('SKQP' in builder) and with_issue:
-      branch = 'skqp/dev' if 'dev_branch' in builder else (
-               'skqp/release' if 'release_branch' in builder else
-               'master')
-      test += api.step_data('get branch for issue',
-                            stdout=api.raw_io.output(branch))
-    yield test
-
   builder = 'Test-Debian9-GCC-GCE-CPU-AVX2-x86_64-Release-All'
   yield (
       api.test('exceptions') +
diff --git a/infra/bots/recipe_modules/flavor/gn_android_flavor.py b/infra/bots/recipe_modules/flavor/gn_android_flavor.py
index d00f77107e..4aef5dd1f2 100644
--- a/infra/bots/recipe_modules/flavor/gn_android_flavor.py
+++ b/infra/bots/recipe_modules/flavor/gn_android_flavor.py
@@ -394,30 +394,8 @@ if actual_freq != str(freq):
     gn      = self.m.vars.skia_dir.join('bin', gn)
 
     self._py('fetch-gn', self.m.vars.skia_dir.join('bin', 'fetch-gn'))
-
-    # If this is the SkQP built, set up the environment and run the script
-    # build the universal APK.
-    if 'SKQP' in extra_tokens:
-      # If this is not an SkQP branch make this a no-op or the build will fail.
-      if 'skqp' not in self.get_branch():
-        return
-
-      ndk_asset = 'android_ndk_linux'
-      sdk_asset = 'android_sdk_linux'
-      android_ndk = self.m.vars.slave_dir.join(ndk_asset)
-      android_home = self.m.vars.slave_dir.join(sdk_asset, 'android-sdk')
-      env = {
-        'ANDROID_NDK': android_ndk,
-        'ANDROID_HOME': android_home,
-      }
-
-      mk_universal = self.m.vars.skia_dir.join('tools', 'skqp',
-                                               'make_universal_apk')
-      with self.m.context(env=env):
-        self._run('make_universal', mk_universal)
-    else:
-      self._run('gn gen', gn, 'gen', self.out_dir, '--args=' + gn_args)
-      self._run('ninja', ninja, '-k', '0', '-C', self.out_dir)
+    self._run('gn gen', gn, 'gen', self.out_dir, '--args=' + gn_args)
+    self._run('ninja', ninja, '-k', '0', '-C', self.out_dir)
 
   def install(self):
     self._adb('mkdir ' + self.device_dirs.resource_dir,
diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json
index 89fde195db..918a12e9da 100644
--- a/infra/bots/tasks.json
+++ b/infra/bots/tasks.json
@@ -96,12 +96,6 @@
         "Build-Debian9-Clang-gce_x86_phone-eng-Android_Framework"
       ]
     },
-    "Build-Debian9-Clang-universal-devrel-Android_SKQP": {
-      "priority": 0.8,
-      "tasks": [
-        "Build-Debian9-Clang-universal-devrel-Android_SKQP"
-      ]
-    },
     "Build-Debian9-Clang-x64-Debug-Android": {
       "priority": 0.8,
       "tasks": [
@@ -3735,33 +3729,6 @@
       "isolate": "compile_skia.isolate",
       "priority": 0.8
     },
-    "Build-Debian9-Clang-universal-devrel-Android_SKQP": {
-      "dependencies": [
-        "Housekeeper-PerCommit-IsolateAndroidNDKLinux",
-        "Housekeeper-PerCommit-IsolateAndroidSDKLinux"
-      ],
-      "dimensions": [
-        "cpu:x86-64-Haswell_GCE",
-        "gpu:none",
-        "os:Debian-9.2",
-        "pool:Skia"
-      ],
-      "extra_args": [
-        "--workdir",
-        "../../..",
-        "compile",
-        "repository=<(REPO)",
-        "buildername=Build-Debian9-Clang-universal-devrel-Android_SKQP",
-        "swarm_out_dir=${ISOLATED_OUTDIR}",
-        "revision=<(REVISION)",
-        "patch_repo=<(PATCH_REPO)",
-        "patch_storage=<(PATCH_STORAGE)",
-        "patch_issue=<(ISSUE)",
-        "patch_set=<(PATCHSET)"
-      ],
-      "isolate": "compile_skia.isolate",
-      "priority": 0.8
-    },
     "Build-Debian9-Clang-x64-Debug-Android": {
       "dependencies": [
         "Housekeeper-PerCommit-IsolateAndroidNDKLinux"
@@ -6381,23 +6348,6 @@
       "isolate": "isolate_ndk_linux.isolate",
       "priority": 0.7
     },
-    "Housekeeper-PerCommit-IsolateAndroidSDKLinux": {
-      "cipd_packages": [
-        {
-          "name": "skia/bots/android_sdk_linux",
-          "path": "android_sdk_linux",
-          "version": "version:0"
-        }
-      ],
-      "dimensions": [
-        "cpu:x86-64-Haswell_GCE",
-        "gpu:none",
-        "os:Debian-9.2",
-        "pool:Skia"
-      ],
-      "isolate": "isolate_android_sdk_linux.isolate",
-      "priority": 0.7
-    },
     "Housekeeper-PerCommit-IsolateSKP": {
       "cipd_packages": [
         {