aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--infra/bots/recipe_modules/flavor/android_flavor.py3
-rw-r--r--infra/bots/recipes/swarm_trigger.py3
2 files changed, 2 insertions, 4 deletions
diff --git a/infra/bots/recipe_modules/flavor/android_flavor.py b/infra/bots/recipe_modules/flavor/android_flavor.py
index 93347e4fc9..c379803da1 100644
--- a/infra/bots/recipe_modules/flavor/android_flavor.py
+++ b/infra/bots/recipe_modules/flavor/android_flavor.py
@@ -32,8 +32,7 @@ def get_device(api):
# Test/Perf bots.
return {
'AndroidOne': 'arm_v7_neon',
- 'GalaxyS3': 'arm_v7_neon',
- 'GalaxyS4': 'arm_v7_neon',
+ 'GalaxyS7': 'arm64',
'NVIDIA_Shield': 'arm64',
'Nexus10': 'arm_v7_neon',
'Nexus5': 'arm_v7_neon',
diff --git a/infra/bots/recipes/swarm_trigger.py b/infra/bots/recipes/swarm_trigger.py
index 060fa73dea..8a61fdad52 100644
--- a/infra/bots/recipes/swarm_trigger.py
+++ b/infra/bots/recipes/swarm_trigger.py
@@ -113,8 +113,7 @@ def swarm_dimensions(builder_cfg):
# For Android, the device type is a better dimension than CPU or GPU.
dimensions['device_type'] = {
'AndroidOne': 'sprout',
- 'GalaxyS3': 'm0', #'smdk4x12', Detected incorrectly by swarming?
- 'GalaxyS4': None, # TODO(borenet,kjlubick)
+ 'GalaxyS7': 'heroqlteatt',
'NVIDIA_Shield': 'foster',
'Nexus10': 'manta',
'Nexus5': 'hammerhead',