Adding android_devices dimension to newly swarmed android perf device.

tools/perf/generate_perf_json.py

 #!/usr/bin/env python
 # 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.
 
 """Script to generate chromium.perf.json and chromium.perf.fyi.json in
 the src/testing/buildbot directory. Maintaining these files by hand is
 too unwieldy.
 """
 
@@ skipping 122 matching lines @@
          ('tracing_perftests', 1)]
       }
     ],
     use_whitelist=True)
   waterfall = add_tester(
     waterfall, 'Android Swarming N5X Tester',
     'fyi-android-swarming-n5x', 'android',
     swarming=[
       {
        'os': 'Android',
+       'android_devices': '1',
        'device_ids': [
            'build245-m4--device1', 'build245-m4--device2',
            'build245-m4--device3', 'build245-m4--device4',
            'build245-m4--device5', 'build245-m4--device6',
            'build245-m4--device7'
         ]
       }
     ],
     use_whitelist=True)
   return waterfall
@@ skipping 320 matching lines @@
 
 
 def get_swarming_dimension(dimension, device_affinity):
   complete_dimension = {
     'id': dimension['device_ids'][device_affinity],
     'os': dimension['os'],
     'pool': 'Chrome-perf',
   }
   if 'gpu' in dimension:
     complete_dimension['gpu'] = dimension['gpu']
+  if 'android_devices' in dimension:
+    complete_dimension['android_devices'] = dimension['android_devices']
   return complete_dimension
 
 
 def generate_cplusplus_isolate_script_test(dimension):
   return [
     generate_isolate_script_entry(
         [get_swarming_dimension(dimension, shard)], [], name, name)
     for name, shard in dimension['perf_tests']
   ]
 
@@ skipping 221 matching lines @@
   waterfall['name'] = 'chromium.perf'
   fyi_waterfall = get_fyi_waterfall_config()
   fyi_waterfall['name'] = 'chromium.perf.fyi'
 
   generate_all_tests(fyi_waterfall)
   generate_all_tests(waterfall)
   return 0
 
 if __name__ == '__main__':
   sys.exit(main())