[infra] Target Android10 for GalaxyS9
Change-Id: I14092e8c41fb09a2d883a96a7b95f984b475846f
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/315864
Reviewed-by: Weston Tracey <westont@google.com>
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Weston Tracey <westont@google.com>
diff --git a/infra/bots/gen_tasks_logic/gen_tasks_logic.go b/infra/bots/gen_tasks_logic/gen_tasks_logic.go
index 458919a..1a08c94 100644
--- a/infra/bots/gen_tasks_logic/gen_tasks_logic.go
+++ b/infra/bots/gen_tasks_logic/gen_tasks_logic.go
@@ -586,7 +586,7 @@
"AndroidOne": {"sprout", "MOB30Q"},
"GalaxyS6": {"zerofltetmo", "NRD90M_G920TUVS6FRC1"},
"GalaxyS7_G930FD": {"herolte", "R16NW_G930FXXS2ERH6"}, // This is Oreo.
- "GalaxyS9": {"starlte", "R16NW_G960FXXU2BRJ8"}, // This is Oreo.
+ "GalaxyS9": {"starlte", "QP1A.190711.020"}, // This is Android10.
"GalaxyS20": {"exynos990", "QP1A.190711.020"},
"MotoG4": {"athene", "NPJS25.93-14.7-8"},
"NVIDIA_Shield": {"foster", "OPR6.170623.010_3507953_1441.7411"},
diff --git a/infra/bots/recipe_modules/flavor/android.py b/infra/bots/recipe_modules/flavor/android.py
index eb8740b..2f9683a 100644
--- a/infra/bots/recipe_modules/flavor/android.py
+++ b/infra/bots/recipe_modules/flavor/android.py
@@ -357,7 +357,7 @@
def install(self):
self._adb('mkdir ' + self.device_dirs.resource_dir,
'shell', 'mkdir', '-p', self.device_dirs.resource_dir)
- if self.m.vars.builder_cfg.get('model') == 'GalaxyS20':
+ if self.m.vars.builder_cfg.get('model') in ['GalaxyS20', 'GalaxyS9']:
# See skia:10184, should be moot once upgraded to Android 11?
self._adb('cp libGLES_mali.so to ' + self.device_dirs.bin_dir,
'shell', 'cp',
diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json
index f782795..dfff974 100755
--- a/infra/bots/tasks.json
+++ b/infra/bots/tasks.json
@@ -17080,7 +17080,7 @@
"Housekeeper-PerCommit-IsolateSkImage"
],
"dimensions": [
- "device_os:R16NW_G960FXXU2BRJ8",
+ "device_os:QP1A.190711.020",
"device_type:starlte",
"os:Android",
"pool:Skia"
@@ -17147,7 +17147,7 @@
"Housekeeper-PerCommit-IsolateSkImage"
],
"dimensions": [
- "device_os:R16NW_G960FXXU2BRJ8",
+ "device_os:QP1A.190711.020",
"device_type:starlte",
"os:Android",
"pool:Skia"
@@ -28026,7 +28026,7 @@
"Housekeeper-PerCommit-IsolateSkImage"
],
"dimensions": [
- "device_os:R16NW_G960FXXU2BRJ8",
+ "device_os:QP1A.190711.020",
"device_type:starlte",
"os:Android",
"pool:Skia"
@@ -28093,7 +28093,7 @@
"Housekeeper-PerCommit-IsolateSkImage"
],
"dimensions": [
- "device_os:R16NW_G960FXXU2BRJ8",
+ "device_os:QP1A.190711.020",
"device_type:starlte",
"os:Android",
"pool:Skia"
@@ -28160,7 +28160,7 @@
"Housekeeper-PerCommit-IsolateSkImage"
],
"dimensions": [
- "device_os:R16NW_G960FXXU2BRJ8",
+ "device_os:QP1A.190711.020",
"device_type:starlte",
"os:Android",
"pool:Skia"
@@ -28227,7 +28227,7 @@
"Housekeeper-PerCommit-IsolateSkImage"
],
"dimensions": [
- "device_os:R16NW_G960FXXU2BRJ8",
+ "device_os:QP1A.190711.020",
"device_type:starlte",
"os:Android",
"pool:Skia"
