Add logcats link in builbot page for android swarming tasks

scripts/slave/recipes/chromium.expected/dynamic_swarmed_output_links_trigger_test.json

 [
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py",
       "--master",
       "chromium.linux",
       "--builder",
       "Android Tests",
@@ skipping 205 matching lines @@
       "-u",
       "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
       "[SLAVE_BUILD]/src/testing/buildbot/chromium.linux.json",
       "/path/to/tmp/json"
     ],
     "name": "read test spec (chromium.linux.json)",
     "~followup_annotations": [
       "@@@STEP_TEXT@path: [SLAVE_BUILD]/src/testing/buildbot/chromium.linux.json@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
       "@@@STEP_LOG_LINE@json.output@  \"Android Tests\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"junit_tests\": [@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"gtest_tests\": [@@@",
       "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"test\": \"base_junit_tests\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"override_compile_targets\": [@@@",
+      "@@@STEP_LOG_LINE@json.output@          \"chrome_public_test_apk\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        ], @@@",
+      "@@@STEP_LOG_LINE@json.output@        \"override_isolate_target\": \"chrome_public_test_apk\", @@@",
+      "@@@STEP_LOG_LINE@json.output@        \"swarming\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@          \"can_use_on_swarming_builders\": true, @@@",
+      "@@@STEP_LOG_LINE@json.output@          \"cipd_packages\": [@@@",
+      "@@@STEP_LOG_LINE@json.output@            {@@@",
+      "@@@STEP_LOG_LINE@json.output@              \"cipd_package\": \"logdog/butler/linux-386\", @@@",
+      "@@@STEP_LOG_LINE@json.output@              \"location\": \"bin\", @@@",
+      "@@@STEP_LOG_LINE@json.output@              \"revision\": \"git_revision:deadbeef\"@@@",
+      "@@@STEP_LOG_LINE@json.output@            }, @@@",
+      "@@@STEP_LOG_LINE@json.output@            {@@@",
+      "@@@STEP_LOG_LINE@json.output@              \"cipd_package\": \"some/other/package\", @@@",
+      "@@@STEP_LOG_LINE@json.output@              \"location\": \"bin\", @@@",
+      "@@@STEP_LOG_LINE@json.output@              \"revision\": \"git_revision:deadbeef\"@@@",
+      "@@@STEP_LOG_LINE@json.output@            }@@@",
+      "@@@STEP_LOG_LINE@json.output@          ], @@@",
+      "@@@STEP_LOG_LINE@json.output@          \"dimension_sets\": [@@@",
+      "@@@STEP_LOG_LINE@json.output@            {@@@",
+      "@@@STEP_LOG_LINE@json.output@              \"build.id\": \"KTU84P\", @@@",
+      "@@@STEP_LOG_LINE@json.output@              \"product.board\": \"hammerhead\"@@@",
+      "@@@STEP_LOG_LINE@json.output@            }@@@",
+      "@@@STEP_LOG_LINE@json.output@          ], @@@",
+      "@@@STEP_LOG_LINE@json.output@          \"output_links\": [@@@",
+      "@@@STEP_LOG_LINE@json.output@            {@@@",
+      "@@@STEP_LOG_LINE@json.output@              \"link\": [@@@",
+      "@@@STEP_LOG_LINE@json.output@                \"https://luci-logdog.appspot.com/v/?s\", @@@",
+      "@@@STEP_LOG_LINE@json.output@                \"=android%2Fswarming%2Flogcats%2F\", @@@",
+      "@@@STEP_LOG_LINE@json.output@                \"${TASK_ID}%2F%2B%2Funified_logcats\"@@@",
+      "@@@STEP_LOG_LINE@json.output@              ], @@@",
+      "@@@STEP_LOG_LINE@json.output@              \"name\": \"shard_index:${SHARD_INDEX}logcats\"@@@",
+      "@@@STEP_LOG_LINE@json.output@            }@@@",
+      "@@@STEP_LOG_LINE@json.output@          ]@@@",
+      "@@@STEP_LOG_LINE@json.output@        }, @@@",
+      "@@@STEP_LOG_LINE@json.output@        \"test\": \"chrome_public_test_apk\"@@@",
       "@@@STEP_LOG_LINE@json.output@      }@@@",
       "@@@STEP_LOG_LINE@json.output@    ]@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
       "@@@STEP_LOG_LINE@json.output@}@@@",
       "@@@STEP_LOG_END@json.output@@@"
     ]
   },
   {
     "cmd": [
       "python",
@@ skipping 82 matching lines @@
       "chromium.linux",
       "--build-number",
       "571"
     ],
     "name": "extract build"
   },
   {
     "cmd": [
       "python",
       "-u",
+      "RECIPE_MODULE[build::isolate]/resources/find_isolated_tests.py",
+      "--build-dir",
+      "[SLAVE_BUILD]/src/out/Release",
+      "--output-json",
+      "/path/to/tmp/json"
+    ],
+    "env": {
+      "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
+      "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
+    },
+    "name": "find isolated tests",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@json.output@{@@@",
+      "@@@STEP_LOG_LINE@json.output@  \"dummy_target_1\": \"[dummy hash for dummy_target_1]\", @@@",
+      "@@@STEP_LOG_LINE@json.output@  \"dummy_target_2\": \"[dummy hash for dummy_target_2]\"@@@",
+      "@@@STEP_LOG_LINE@json.output@}@@@",
+      "@@@STEP_LOG_END@json.output@@@",
+      "@@@SET_BUILD_PROPERTY@swarm_hashes@{\"dummy_target_1\": \"[dummy hash for dummy_target_1]\", \"dummy_target_2\": \"[dummy hash for dummy_target_2]\"}@@@"
+    ]
+  },
+  {
+    "cmd": [
+      "python",
+      "-u",
       "RECIPE_MODULE[build::adb]/resources/list_devices.py",
       "['[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb', 'devices']",
       "/path/to/tmp/json"
     ],
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
       "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
     },
     "name": "List adb devices",
     "~followup_annotations": [
@@ skipping 26 matching lines @@
       "@@@STEP_LOG_LINE@python.inline@  subprocess.check_call([adb_path, '-s', device, 'root'])@@@",
       "@@@STEP_LOG_LINE@python.inline@  subprocess.check_call([adb_path, '-s', device, 'wait-for-device'])@@@",
       "@@@STEP_LOG_LINE@python.inline@  print 'Finished rooting device %s' % (device)@@@",
       "@@@STEP_LOG_END@python.inline@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
-      "[SLAVE_BUILD]/src/build/android/test_runner.py",
-      "junit",
-      "-s",
-      "base_junit_tests",
-      "--verbose",
-      "--release",
-      "--json-results-file",
+      "[SLAVE_BUILD]/src/tools/swarming_client/swarming.py",
+      "trigger",
+      "--swarming",
+      "https://chromium-swarm.appspot.com",
+      "--isolate-server",
+      "https://isolateserver.appspot.com",
+      "--priority",
+      "25",
+      "--shards",
+      "1",
+      "--task-name",
+      "chrome_public_test_apk/Android/cccccccccc/Android Tests/571",
+      "--dump-json",
       "/path/to/tmp/json",
-      "--adb-path",
-      "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools/adb"
+      "--expiration",
+      "3600",
+      "--io-timeout",
+      "1200",
+      "--hard-timeout",
+      "3600",
+      "--dimension",
+      "android_devices",
+      "6",
+      "--dimension",
+      "build.id",
+      "KTU84P",
+      "--dimension",
+      "os",
+      "Android",
+      "--dimension",
+      "pool",
+      "Chrome",
+      "--dimension",
+      "product.board",
+      "hammerhead",
+      "--tag",
+      "buildername:Android Tests",
+      "--tag",
+      "buildnumber:571",
+      "--tag",
+      "data:cccccccccccccccccc",
+      "--tag",
+      "master:chromium.linux",
+      "--tag",
+      "name:chrome_public_test_apk",
+      "--tag",
+      "os:Android",
+      "--tag",
+      "project:chromium",
+      "--tag",
+      "purpose:CI",
+      "--tag",
+      "purpose:post-commit",
+      "--tag",
+      "slavename:TestSlavename",
+      "--tag",
+      "stepname:chrome_public_test_apk on Android",
+      "--idempotent",
+      "--cipd-package",
+      "bin:logdog/butler/linux-386:git_revision:deadbeef",
+      "--cipd-package",
+      "bin:some/other/package:git_revision:deadbeef",
+      "cccccccccccccccccc",
+      "--",
+      "--test-launcher-summary-output=${ISOLATED_OUTDIR}/output.json"
     ],
     "env": {
-      "CHROMIUM_OUTPUT_DIR": "[SLAVE_BUILD]/src/out/Release",
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
       "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
     },
-    "name": "base_junit_tests",
+    "name": "[trigger] chrome_public_test_apk on Android",
     "~followup_annotations": [
-      "step returned non-zero exit code: 1",
-      "@@@STEP_TEXT@<br/>failures:<br/>Test.Two<br/>@@@",
-      "@@@STEP_FAILURE@@@"
+      "@@@STEP_LOG_LINE@json.output@{@@@",
+      "@@@STEP_LOG_LINE@json.output@  \"base_task_name\": \"chrome_public_test_apk/Android/cccccccccc/Android Tests/571\", @@@",
+      "@@@STEP_LOG_LINE@json.output@  \"tasks\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"chrome_public_test_apk/Android/cccccccccc/Android Tests/571\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@      \"shard_index\": 0, @@@",
+      "@@@STEP_LOG_LINE@json.output@      \"task_id\": \"10000\", @@@",
+      "@@@STEP_LOG_LINE@json.output@      \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"@@@",
+      "@@@STEP_LOG_LINE@json.output@    }@@@",
+      "@@@STEP_LOG_LINE@json.output@  }@@@",
+      "@@@STEP_LOG_LINE@json.output@}@@@",
+      "@@@STEP_LOG_END@json.output@@@",
+      "@@@STEP_LINK@shard #0@https://chromium-swarm.appspot.com/user/task/10000@@@"
     ]
   },
   {
+    "allow_subannotations": true,
+    "cmd": [
+      "python",
+      "-u",
+      "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py",
+      "python",
+      "RECIPE_MODULE[build::swarming]/resources/collect_gtest_task.py",
+      "--swarming-client-dir",
+      "[SLAVE_BUILD]/src/tools/swarming_client",
+      "--temp-root-dir",
+      "[TMP_BASE]",
+      "--merged-test-output",
+      "/path/to/tmp/json",
+      "--",
+      "collect",
+      "--swarming",
+      "https://chromium-swarm.appspot.com",
+      "--decorate",
+      "--print-status-updates",
+      "--json",
+      "{\"base_task_name\": \"chrome_public_test_apk/Android/cccccccccc/Android Tests/571\", \"tasks\": {\"chrome_public_test_apk/Android/cccccccccc/Android Tests/571\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}"
+    ],
+    "env": {
+      "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
+      "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
+    },
+    "name": "chrome_public_test_apk on Android",
+    "~followup_annotations": [
+      "@@@STEP_LINK@shard #0 isolated out@blah@@@",
+      "@@@STEP_LINK@shard_index:0logcats@https://luci-logdog.appspot.com/v/?s=android%2Fswarming%2Flogcats%2F10001%2F%2B%2Funified_logcats@@@"
+    ]
+  },
+  {
     "cmd": [
       "python",
       "-u",
       "RECIPE_MODULE[build::test_results]/resources/upload_gtest_test_results.py",
       "--input-gtest-json",
-      "{\"per_iteration_data\": [{\"Test.One\": [{\"elapsed_time_ms\": 0, \"output_snippet\": \"\", \"status\": \"SUCCESS\"}], \"Test.Three\": [{\"elapsed_time_ms\": 0, \"output_snippet\": \"\", \"status\": \"SUCCESS\"}], \"Test.Two\": [{\"elapsed_time_ms\": 0, \"output_snippet\": \"\", \"status\": \"FAILURE\"}]}]}",
+      "{\"per_iteration_data\": [{\"Test.One\": [{\"elapsed_time_ms\": 0, \"output_snippet\": \"\", \"status\": \"SUCCESS\"}], \"Test.Three\": [{\"elapsed_time_ms\": 0, \"output_snippet\": \"\", \"status\": \"SUCCESS\"}], \"Test.Two\": [{\"elapsed_time_ms\": 0, \"output_snippet\": \"\", \"status\": \"SUCCESS\"}]}], \"swarming_summary\": {\"shards\": [{\"outputs_ref\": {\"view_url\": \"blah\"}}]}}",
       "--master-name",
       "chromium.linux",
       "--builder-name",
       "Android Tests",
       "--build-number",
       "571",
       "--test-type",
-      "base_junit_tests",
+      "chrome_public_test_apk on Android",
       "--test-results-server",
       "test-results.appspot.com",
       "--chrome-revision",
-      "refs/heads/master@{#170242}"
+      "170242"
     ],
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
       "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
     },
-    "name": "Upload to test-results [base_junit_tests]"
+    "name": "Upload to test-results [chrome_public_test_apk on Android]"
   },
   {
     "cmd": [
       "python",
       "-u",
       "\nimport glob, os, sys\nfor report in glob.glob(sys.argv[1]):\n  with open(report, 'r') as f:\n    for l in f.readlines():\n      print l\n  os.remove(report)\n",
       "[SLAVE_BUILD]/src/out/Release/test_logs/*.log"
     ],
     "env": {
       "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
       "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
     },
     "name": "test_report",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@python.inline@@@@",
       "@@@STEP_LOG_LINE@python.inline@import glob, os, sys@@@",
       "@@@STEP_LOG_LINE@python.inline@for report in glob.glob(sys.argv[1]):@@@",
       "@@@STEP_LOG_LINE@python.inline@  with open(report, 'r') as f:@@@",
       "@@@STEP_LOG_LINE@python.inline@    for l in f.readlines():@@@",
       "@@@STEP_LOG_LINE@python.inline@      print l@@@",
       "@@@STEP_LOG_LINE@python.inline@  os.remove(report)@@@",
       "@@@STEP_LOG_END@python.inline@@@"
     ]
   },
   {
     "name": "$result",
-    "reason": "1 tests failed: ['base_junit_tests']",
     "recipe_result": null,
-    "status_code": 1
+    "status_code": 0
   }
 ]