diff --git a/BUILD.gn b/BUILD.gn index 45859537cfcbb2..27a2a7db290450 100644 --- a/BUILD.gn +++ b/BUILD.gn @@ -1066,14 +1066,14 @@ group("chromium_builder_perf") { } if (is_win) { - data_deps += [ "//chrome/installer/mini_installer:mini_installer" ] + data_deps += [ + "//chrome/installer/mini_installer:mini_installer", + "//chrome/test:angle_perftests", + ] } else { data_deps += [ "//third_party/breakpad:minidump_stackwalk($host_toolchain)" ] } - if (is_win || is_android) { - data_deps += [ "//chrome/test:angle_perftests" ] - } } } diff --git a/testing/buildbot/chromium.perf.json b/testing/buildbot/chromium.perf.json index ca324add99734e..580aa6ef3f35da 100644 --- a/testing/buildbot/chromium.perf.json +++ b/testing/buildbot/chromium.perf.json @@ -3,8 +3,7 @@ "AAAAA2 See //tools/perf/generate_perf_data to make changes": {}, "Android Compile": { "additional_compile_targets": [ - "microdump_stackwalk", - "angle_perftests" + "microdump_stackwalk" ] }, "Android Nexus5 Perf": { @@ -4720,26 +4719,6 @@ }, "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", @@ -28112,8 +28091,7 @@ }, "Android arm64 Compile": { "additional_compile_targets": [ - "microdump_stackwalk", - "angle_perftests" + "microdump_stackwalk" ] }, "Linux Builder": { diff --git a/tools/perf/core/perf_data_generator.py b/tools/perf/core/perf_data_generator.py index 9239e1b90b114e..0b92ebf9868d33 100755 --- a/tools/perf/core/perf_data_generator.py +++ b/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', 'angle_perftests'], - 'Android arm64 Compile': ['microdump_stackwalk', 'angle_perftests'], + 'Android Compile': ['microdump_stackwalk'], + 'Android arm64 Compile': ['microdump_stackwalk'], 'Linux Builder': ['chromedriver'], 'Mac Builder': ['chromedriver'], 'Win Builder': ['chromedriver'], @@ -179,7 +179,6 @@ 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 ] }