Adding android_devices dimension to newly swarmed android perf device.

TBR=dtu@chromium.org

Review-Url: https://codereview.chromium.org/2560183002
Cr-Commit-Position: refs/heads/master@{#437529}

testing/buildbot/chromium.perf.fyi.json

@@ -20,6 +20,7 @@
           "can_use_on_swarming_builders": true,
           "dimension_sets": [
             {
+              "android_devices": "1",
               "id": "build245-m4--device1",
               "os": "Android",
               "pool": "Chrome-perf"
@@ -47,6 +48,7 @@
           "can_use_on_swarming_builders": true,
           "dimension_sets": [
             {
+              "android_devices": "1",
               "id": "build245-m4--device1",
               "os": "Android",
               "pool": "Chrome-perf"
@@ -73,6 +75,7 @@
           "can_use_on_swarming_builders": true,
           "dimension_sets": [
             {
+              "android_devices": "1",
               "id": "build245-m4--device2",
               "os": "Android",
               "pool": "Chrome-perf"
@@ -100,6 +103,7 @@
           "can_use_on_swarming_builders": true,
           "dimension_sets": [
             {
+              "android_devices": "1",
               "id": "build245-m4--device2",
               "os": "Android",
               "pool": "Chrome-perf"
@@ -126,6 +130,7 @@
           "can_use_on_swarming_builders": true,
           "dimension_sets": [
             {
+              "android_devices": "1",
               "id": "build245-m4--device3",
               "os": "Android",
               "pool": "Chrome-perf"
@@ -153,6 +158,7 @@
           "can_use_on_swarming_builders": true,
           "dimension_sets": [
             {
+              "android_devices": "1",
               "id": "build245-m4--device3",
               "os": "Android",
               "pool": "Chrome-perf"
@@ -179,6 +185,7 @@
           "can_use_on_swarming_builders": true,
           "dimension_sets": [
             {
+              "android_devices": "1",
               "id": "build245-m4--device4",
               "os": "Android",
               "pool": "Chrome-perf"
@@ -206,6 +213,7 @@
           "can_use_on_swarming_builders": true,
           "dimension_sets": [
             {
+              "android_devices": "1",
               "id": "build245-m4--device4",
               "os": "Android",
               "pool": "Chrome-perf"
@@ -232,6 +240,7 @@
           "can_use_on_swarming_builders": true,
           "dimension_sets": [
             {
+              "android_devices": "1",
               "id": "build245-m4--device5",
               "os": "Android",
               "pool": "Chrome-perf"
@@ -259,6 +268,7 @@
           "can_use_on_swarming_builders": true,
           "dimension_sets": [
             {
+              "android_devices": "1",
               "id": "build245-m4--device5",
               "os": "Android",
               "pool": "Chrome-perf"

tools/perf/generate_perf_json.py

@@ -140,6 +140,7 @@ def get_fyi_waterfall_config():
     swarming=[
       {
        'os': 'Android',
+       'android_devices': '1',
        'device_ids': [
            'build245-m4--device1', 'build245-m4--device2',
            'build245-m4--device3', 'build245-m4--device4',
@@ -480,6 +481,8 @@ def get_swarming_dimension(dimension, device_affinity):
   }
   if 'gpu' in dimension:
     complete_dimension['gpu'] = dimension['gpu']
+  if 'android_devices' in dimension:
+    complete_dimension['android_devices'] = dimension['android_devices']
   return complete_dimension