From 120265a75023ec12e0ebd9e626d79d48b6ba9b37 Mon Sep 17 00:00:00 2001
From: Takuto Ikuta <tikuta@chromium.org>
Date: Wed, 15 Sep 2021 04:08:27 +0000
Subject: [PATCH] Revert "infra/config: update android device type"

This reverts commit 913b7d389e658ea102754e74dd9b94fd78af9c3d.

Reason for revert:
android devices are changed back to bullhead in https://crbug.com/1242847#c27

Original change's description:
> infra/config: update android device type
>
> This is for https://crbug.com/1242847#c17
>
> Bug: chromium:1242847
> Change-Id: I139e75773660d985617756141a93e285dbc7e646
> Reviewed-on: https://chromium-review.googlesource.com/c/libyuv/libyuv/+/3141217
> Reviewed-by: Mirko Bonadei <mbonadei@chromium.org>
> Commit-Queue: Mirko Bonadei <mbonadei@chromium.org>

Bug: chromium:1242847
Change-Id: I3b45071f1fd2707387917b2cb1234b9f996eeb90
Reviewed-on: https://chromium-review.googlesource.com/c/libyuv/libyuv/+/3161663
Reviewed-by: Mirko Bonadei <mbonadei@chromium.org>
Commit-Queue: Mirko Bonadei <mbonadei@chromium.org>
---
 cr-buildbucket.cfg | 12 ++++++------
 main.star          |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/cr-buildbucket.cfg b/cr-buildbucket.cfg
index ddba8b939..7aa6bd180 100644
--- a/cr-buildbucket.cfg
+++ b/cr-buildbucket.cfg
@@ -87,7 +87,7 @@ buckets {
       name: "Android Tester ARM32 Debug (Nexus 5X)"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "device_type:walleye"
+      dimensions: "device_type:bullhead"
       dimensions: "pool:luci.flex.ci"
       recipe {
         name: "libyuv/libyuv"
@@ -108,7 +108,7 @@ buckets {
       name: "Android Tester ARM32 Release (Nexus 5X)"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "device_type:walleye"
+      dimensions: "device_type:bullhead"
       dimensions: "pool:luci.flex.ci"
       recipe {
         name: "libyuv/libyuv"
@@ -129,7 +129,7 @@ buckets {
       name: "Android Tester ARM64 Debug (Nexus 5X)"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "device_type:walleye"
+      dimensions: "device_type:bullhead"
       dimensions: "pool:luci.flex.ci"
       recipe {
         name: "libyuv/libyuv"
@@ -793,7 +793,7 @@ buckets {
       name: "android"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "device_type:walleye"
+      dimensions: "device_type:bullhead"
       dimensions: "pool:luci.flex.try"
       recipe {
         name: "libyuv/libyuv"
@@ -814,7 +814,7 @@ buckets {
       name: "android_arm64"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "device_type:walleye"
+      dimensions: "device_type:bullhead"
       dimensions: "pool:luci.flex.try"
       recipe {
         name: "libyuv/libyuv"
@@ -835,7 +835,7 @@ buckets {
       name: "android_rel"
       swarming_host: "chromium-swarm.appspot.com"
       swarming_tags: "vpython:native-python-wrapper"
-      dimensions: "device_type:walleye"
+      dimensions: "device_type:bullhead"
       dimensions: "pool:luci.flex.try"
       recipe {
         name: "libyuv/libyuv"
diff --git a/main.star b/main.star
index efd15fec3..54c9562ed 100755
--- a/main.star
+++ b/main.star
@@ -185,7 +185,7 @@ luci.bucket(
 
 def get_os_dimensions(os):
     if os == "android":
-        return {"device_type": "walleye"}
+        return {"device_type": "bullhead"}
     if os == "ios" or os == "mac":
         return {"os": "Mac-10.15", "cpu": "x86-64"}
     elif os == "win":