| Index: testing/buildbot/chromium.android.json
|
| diff --git a/testing/buildbot/chromium.android.json b/testing/buildbot/chromium.android.json
|
| index 9c4668eec34cc4ef3ba7e4a541a08bfec7104912..d934866b5b01aba2032764421bcee15617edb970 100644
|
| --- a/testing/buildbot/chromium.android.json
|
| +++ b/testing/buildbot/chromium.android.json
|
| @@ -104,41 +104,6 @@
|
| "test": "base_unittests"
|
| },
|
| {
|
| - "override_compile_targets": [
|
| - "blimp_test_apk"
|
| - ],
|
| - "override_isolate_target": "blimp_test_apk",
|
| - "swarming": {
|
| - "can_use_on_swarming_builders": true,
|
| - "cipd_packages": [
|
| - {
|
| - "cipd_package": "infra/tools/luci/logdog/butler/${platform}",
|
| - "location": "bin",
|
| - "revision": "git_revision:25755a2c316937ee44a6432163dc5e2f9c85cf58"
|
| - }
|
| - ],
|
| - "dimension_sets": [
|
| - {
|
| - "android_devices": "4",
|
| - "device_os": "MMB29Q",
|
| - "device_type": "bullhead"
|
| - }
|
| - ],
|
| - "hard_timeout": 960,
|
| - "output_links": [
|
| - {
|
| - "link": [
|
| - "https://luci-logdog.appspot.com/v/?s",
|
| - "=android%2Fswarming%2Flogcats%2F",
|
| - "${TASK_ID}%2F%2B%2Funified_logcats"
|
| - ],
|
| - "name": "shard #${SHARD_INDEX} logcats"
|
| - }
|
| - ]
|
| - },
|
| - "test": "blimp_test_apk"
|
| - },
|
| - {
|
| "override_isolate_target": "blimp_unittests",
|
| "swarming": {
|
| "can_use_on_swarming_builders": true,
|
| @@ -1337,14 +1302,6 @@
|
| "test": "android_webview_test_apk"
|
| },
|
| {
|
| - "apk_under_test": "Blimp.apk",
|
| - "override_compile_targets": [
|
| - "blimp_test_apk"
|
| - ],
|
| - "test": "blimp_test_apk",
|
| - "test_apk": "BlimpTest.apk"
|
| - },
|
| - {
|
| "test": "chrome_public_test_apk"
|
| },
|
| {
|
| @@ -2325,42 +2282,6 @@
|
| },
|
| {
|
| "override_compile_targets": [
|
| - "blimp_test_apk"
|
| - ],
|
| - "override_isolate_target": "blimp_test_apk",
|
| - "swarming": {
|
| - "can_use_on_swarming_builders": true,
|
| - "cipd_packages": [
|
| - {
|
| - "cipd_package": "infra/tools/luci/logdog/butler/${platform}",
|
| - "location": "bin",
|
| - "revision": "git_revision:25755a2c316937ee44a6432163dc5e2f9c85cf58"
|
| - }
|
| - ],
|
| - "dimension_sets": [
|
| - {
|
| - "android_devices": "4",
|
| - "device_os": "LMY48I",
|
| - "device_type": "hammerhead"
|
| - }
|
| - ],
|
| - "expiration": 10800,
|
| - "hard_timeout": 960,
|
| - "output_links": [
|
| - {
|
| - "link": [
|
| - "https://luci-logdog.appspot.com/v/?s",
|
| - "=android%2Fswarming%2Flogcats%2F",
|
| - "${TASK_ID}%2F%2B%2Funified_logcats"
|
| - ],
|
| - "name": "shard #${SHARD_INDEX} logcats"
|
| - }
|
| - ]
|
| - },
|
| - "test": "blimp_test_apk"
|
| - },
|
| - {
|
| - "override_compile_targets": [
|
| "chrome_public_test_apk"
|
| ],
|
| "override_isolate_target": "chrome_public_test_apk",
|
| @@ -2567,14 +2488,6 @@
|
| "test": "android_webview_test_apk"
|
| },
|
| {
|
| - "apk_under_test": "Blimp.apk",
|
| - "override_compile_targets": [
|
| - "blimp_test_apk"
|
| - ],
|
| - "test": "blimp_test_apk",
|
| - "test_apk": "BlimpTest.apk"
|
| - },
|
| - {
|
| "test": "chrome_public_test_apk"
|
| },
|
| {
|
| @@ -2684,40 +2597,6 @@
|
| "test": "base_unittests"
|
| },
|
| {
|
| - "override_compile_targets": [
|
| - "blimp_test_apk"
|
| - ],
|
| - "override_isolate_target": "blimp_test_apk",
|
| - "swarming": {
|
| - "can_use_on_swarming_builders": true,
|
| - "cipd_packages": [
|
| - {
|
| - "cipd_package": "infra/tools/luci/logdog/butler/${platform}",
|
| - "location": "bin",
|
| - "revision": "git_revision:25755a2c316937ee44a6432163dc5e2f9c85cf58"
|
| - }
|
| - ],
|
| - "dimension_sets": [
|
| - {
|
| - "device_os": "MMB29Q",
|
| - "device_type": "bullhead"
|
| - }
|
| - ],
|
| - "hard_timeout": 600,
|
| - "output_links": [
|
| - {
|
| - "link": [
|
| - "https://luci-logdog.appspot.com/v/?s",
|
| - "=android%2Fswarming%2Flogcats%2F",
|
| - "${TASK_ID}%2F%2B%2Funified_logcats"
|
| - ],
|
| - "name": "shard #${SHARD_INDEX} logcats"
|
| - }
|
| - ]
|
| - },
|
| - "test": "blimp_test_apk"
|
| - },
|
| - {
|
| "override_isolate_target": "blimp_unittests",
|
| "swarming": {
|
| "can_use_on_swarming_builders": true,
|
| @@ -3794,14 +3673,6 @@
|
| "test": "android_webview_test_apk"
|
| },
|
| {
|
| - "apk_under_test": "Blimp.apk",
|
| - "override_compile_targets": [
|
| - "blimp_test_apk"
|
| - ],
|
| - "test": "blimp_test_apk",
|
| - "test_apk": "BlimpTest.apk"
|
| - },
|
| - {
|
| "test": "chrome_public_test_apk"
|
| },
|
| {
|
|
|