Add Swarming task for downloading Android SDK on Skia bots

scripts/slave/recipes/skia/swarm_trigger.expected/Housekeeper-PerCommit.json

Index: scripts/slave/recipes/skia/swarm_trigger.expected/Housekeeper-PerCommit.json
diff --git a/scripts/slave/recipes/skia/swarm_trigger.expected/Housekeeper-PerCommit.json b/scripts/slave/recipes/skia/swarm_trigger.expected/Housekeeper-PerCommit.json
index e920e8a28dc29545d7b42686f00159c532c34194..f7eeaf10b8702c620e136a8287734b07ebe08c0b 100644
--- a/scripts/slave/recipes/skia/swarm_trigger.expected/Housekeeper-PerCommit.json
+++ b/scripts/slave/recipes/skia/swarm_trigger.expected/Housekeeper-PerCommit.json
@@ -394,6 +394,61 @@
     "cmd": [
       "python",
       "-u",
+      "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n  if os.path.exists(path):\n    print \"%s exists but is not a dir\" % path\n    sys.exit(1)\n  os.makedirs(path, mode)\n",
+      "[SLAVE_BUILD]/swarming_temp_dir",
+      "511"
+    ],
+    "name": "makedirs swarming tmp dir (2)",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@python.inline@@@@",
+      "@@@STEP_LOG_LINE@python.inline@import sys, os@@@",
+      "@@@STEP_LOG_LINE@python.inline@path = sys.argv[1]@@@",
+      "@@@STEP_LOG_LINE@python.inline@mode = int(sys.argv[2])@@@",
+      "@@@STEP_LOG_LINE@python.inline@if not os.path.isdir(path):@@@",
+      "@@@STEP_LOG_LINE@python.inline@  if os.path.exists(path):@@@",
+      "@@@STEP_LOG_LINE@python.inline@    print \"%s exists but is not a dir\" % path@@@",
+      "@@@STEP_LOG_LINE@python.inline@    sys.exit(1)@@@",
+      "@@@STEP_LOG_LINE@python.inline@  os.makedirs(path, mode)@@@",
+      "@@@STEP_LOG_END@python.inline@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
+      "{\n    \"args\": [\n        \"--isolate\", \n        \"[BUILD]/scripts/slave/recipes/skia/gsutil.isolate\", \n        \"--isolated\", \n        \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-isolate_gsutil.isolated\", \n        \"--config-variable\", \n        \"OS\", \n        \"linux\"\n    ], \n    \"dir\": \"[BUILD]/scripts/slave/recipes/skia\", \n    \"version\": 1\n}",
+      "[SLAVE_BUILD]/swarming_temp_dir/isolate_gsutil.isolated.gen.json"
+    ],
+    "name": "Write isolate_gsutil.isolated.gen.json"
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "RECIPE_MODULE[build::isolate]/resources/isolate.py",
+      "[SLAVE_BUILD]/swarming.client",
+      "batcharchive",
+      "--dump-json",
+      "/path/to/tmp/json",
+      "--isolate-server",
+      "https://isolateserver.appspot.com",
+      "--verbose",
+      "[SLAVE_BUILD]/swarming_temp_dir/isolate_gsutil.isolated.gen.json"
+    ],
+    "name": "isolate tests (2)",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@json.output@{@@@",
+      "@@@STEP_LOG_LINE@json.output@  \"isolate_gsutil\": \"[dummy hash for isolate_gsutil]\"@@@",
+      "@@@STEP_LOG_LINE@json.output@}@@@",
+      "@@@STEP_LOG_END@json.output@@@",
+      "@@@SET_BUILD_PROPERTY@swarm_hashes@{\"isolate_gsutil\": \"[dummy hash for isolate_gsutil]\"}@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
       "[SLAVE_BUILD]/skia/tools/buildbot_spec.py",
       "/path/to/tmp/json",
       "Build-Ubuntu-GCC-x86_64-Release-Shared"
@@ -440,7 +495,7 @@
       "[SLAVE_BUILD]/swarming_temp_dir",
       "511"
     ],
-    "name": "makedirs swarming tmp dir (2)",
+    "name": "makedirs swarming tmp dir (3)",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@python.inline@@@@",
       "@@@STEP_LOG_LINE@python.inline@import sys, os@@@",
@@ -478,7 +533,7 @@
       "--verbose",
       "[SLAVE_BUILD]/swarming_temp_dir/compile_skia.isolated.gen.json"
     ],
-    "name": "isolate tests (2)",
+    "name": "isolate tests (3)",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@json.output@{@@@",
       "@@@STEP_LOG_LINE@json.output@  \"compile_skia\": \"[dummy hash for compile_skia]\"@@@",
@@ -671,7 +726,7 @@
       "[SLAVE_BUILD]/swarming_temp_dir",
       "511"
     ],
-    "name": "makedirs swarming tmp dir (3)",
+    "name": "makedirs swarming tmp dir (4)",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@python.inline@@@@",
       "@@@STEP_LOG_LINE@python.inline@import sys, os@@@",
@@ -709,7 +764,7 @@
       "--verbose",
       "[SLAVE_BUILD]/swarming_temp_dir/housekeeper_skia.isolated.gen.json"
     ],
-    "name": "isolate tests (3)",
+    "name": "isolate tests (4)",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@json.output@{@@@",
       "@@@STEP_LOG_LINE@json.output@  \"housekeeper_skia\": \"[dummy hash for housekeeper_skia]\"@@@",
@@ -724,7 +779,8 @@
       "-u",
       "\nimport json\nimport sys\nwith open(sys.argv[1]) as f:\n  isolated = json.load(f)\nif not isolated.get('includes'):\n  isolated['includes'] = []\nfor h in sys.argv[2:]:\n  isolated['includes'].append(h)\nwith open(sys.argv[1], 'w') as f:\n  json.dump(isolated, f, sort_keys=True)\n",
       "[SLAVE_BUILD]/swarming_temp_dir/skia-task-housekeeper_skia.isolated",
-      "[dummy hash for isolate_recipes]"
+      "[dummy hash for isolate_recipes]",
+      "abc123"
     ],
     "name": "add_isolated_input (2)",
     "~followup_annotations": [