Run angle_perftests on Nexus 5X Perf bot

Also build angle_perftests on Android builders

BUG=675997
TBR=eyaich@chromium.org,dpranke@chromium.org

Change-Id: I9e73e19599e3cc435f02960839f2e780402d0188
Reviewed-on: https://chromium-review.googlesource.com/752582
Commit-Queue: Yuly Novikov <ynovikov@chromium.org>
Reviewed-by: Yuly Novikov <ynovikov@chromium.org>
Reviewed-by: Ned Nguyen <nednguyen@google.com>
Reviewed-by: Stephen Martinis <martiniss@chromium.org>
Cr-Commit-Position: refs/heads/master@{#515462}

BUILD.gn

@@ -1066,14 +1066,14 @@ group("chromium_builder_perf") {
     }
 
     if (is_win) {
-      data_deps += [
-        "//chrome/installer/mini_installer:mini_installer",
-        "//chrome/test:angle_perftests",
-      ]
+      data_deps += [ "//chrome/installer/mini_installer:mini_installer" ]
     } else {
       data_deps +=
           [ "//third_party/breakpad:minidump_stackwalk($host_toolchain)" ]
     }
+    if (is_win || is_android) {
+      data_deps += [ "//chrome/test:angle_perftests" ]
+    }
   }
 }
 

testing/buildbot/chromium.perf.json

@@ -3,7 +3,8 @@
   "AAAAA2 See //tools/perf/generate_perf_data to make changes": {},
   "Android Compile": {
     "additional_compile_targets": [
-      "microdump_stackwalk"
+      "microdump_stackwalk",
+      "angle_perftests"
     ]
   },
   "Android Nexus5 Perf": {
@@ -4719,6 +4720,26 @@
   },
   "Android Nexus5X Perf": {
     "isolated_scripts": [
+      {
+        "args": [],
+        "isolate_name": "angle_perftests",
+        "name": "angle_perftests",
+        "swarming": {
+          "can_use_on_swarming_builders": true,
+          "dimension_sets": [
+            {
+              "id": "build73-b1--device4",
+              "os": "Android",
+              "pool": "Chrome-perf"
+            }
+          ],
+          "expiration": 36000,
+          "hard_timeout": 10800,
+          "ignore_task_failure": false,
+          "io_timeout": 600,
+          "upload_test_results": true
+        }
+      },
       {
         "args": [
           "blink_perf.bindings",
@@ -28091,7 +28112,8 @@
   },
   "Android arm64 Compile": {
     "additional_compile_targets": [
-      "microdump_stackwalk"
+      "microdump_stackwalk",
+      "angle_perftests"
     ]
   },
   "Linux Builder": {

tools/perf/core/perf_data_generator.py

@@ -140,8 +140,8 @@ def get_fyi_waterfall_config():
 # bisecting Chrome builds with their web tests. For questions or to report
 # issues, please contact johnchen@chromium.org and stgao@chromium.org.
 BUILDER_ADDITIONAL_COMPILE_TARGETS = {
-    'Android Compile': ['microdump_stackwalk'],
-    'Android arm64 Compile': ['microdump_stackwalk'],
+    'Android Compile': ['microdump_stackwalk', 'angle_perftests'],
+    'Android arm64 Compile': ['microdump_stackwalk', 'angle_perftests'],
     'Linux Builder': ['chromedriver'],
     'Mac Builder': ['chromedriver'],
     'Win Builder': ['chromedriver'],
@@ -179,6 +179,7 @@ def get_waterfall_config():
        'perf_tests': [
          ('tracing_perftests', 'build73-b1--device2'),
          ('gpu_perftests', 'build73-b1--device2'),
+         ('angle_perftests', 'build73-b1--device4'),
          #  ('cc_perftests', 'build73-b1--device2'),  # crbug.com/721757
         ]
       }