Specify the Android build number as a swarming dimension

infra/bots/recipes/swarm_trigger.py

 # Copyright 2016 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 
 # Recipe module for Skia Swarming trigger.
 
 
 import os
 import json
@@ skipping 101 matching lines @@
   }
   dimensions['os'] = builder_cfg.get('os', 'Ubuntu')
   if builder_cfg.get('extra_config', '').startswith('CT_'):
     dimensions['pool'] = 'SkiaCT'
     return dimensions  # Do not need any more dimensions for CT builders.
   if 'Win' in builder_cfg.get('os', ''):
     dimensions['os'] = 'Windows'
   if builder_cfg['role'] in ('Test', 'Perf'):
     if 'Android' in builder_cfg['os']:
       # 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',
-        'Nexus6':        'shamu',
-        'Nexus6p':       'angler',
-        'Nexus7':        'grouper',
-        'Nexus7v2':      'flo',
-        'Nexus9':        'flounder',
-        'NexusPlayer':   'fugu',
+      device_type, device_os = {
+        'AndroidOne':    ('sprout',     'MOB30Q'),
+        'GalaxyS7':      ('heroqlteatt','MMB29M'),
+        'NVIDIA_Shield': ('foster',     'MRA58K'),
+        'Nexus10':       ('manta',      'LMY49J'),
+        'Nexus5':        ('hammerhead', 'MOB31E'),
+        'Nexus6':        ('shamu',      'M'),
+        'Nexus6p':       ('angler',     'NRD91E'),
+        'Nexus7':        ('grouper',    'LMY47V'),
+        'Nexus7v2':      ('flo',        'M'),
+        'Nexus9':        ('flounder',   'NRD91D'),
+        'NexusPlayer':   ('fugu',       'NRD90R'),
       }[builder_cfg['model']]
+      dimensions['device_type'] = device_type
+      dimensions['device_os'] = device_os
     elif 'iOS' in builder_cfg['os']:
       # For iOS, the device type is a better dimension than CPU or GPU.
       dimensions['device'] = {
         'iPad4': 'iPad4,1',
       }[builder_cfg['model']]
       # TODO(borenet): Replace this hack with something better.
       dimensions['os'] = 'iOS-9.2'
     elif builder_cfg['cpu_or_gpu'] == 'CPU':
       dimensions['gpu'] = 'none'
       dimensions['cpu'] = {
@@ skipping 616 matching lines @@
           path_config='kitchen',
           revision='abc123',
           **gerrit_kwargs) +
       api.step_data(
           'upload new .isolated file for test_skia',
           stdout=api.raw_io.output('def456 XYZ.isolated')) +
       api.step_data(
           'upload new .isolated file for upload_dm_results_skia',
           stdout=api.raw_io.output('def456 XYZ.isolated'))
   )