Commit cbc0c2e4 authored by jmadill's avatar jmadill Committed by Commit bot

Explicitly depend on ICU to fix GPU isolate races.

This missing dependency could cause intermittent broken builds.

BUG=417583

Review URL: https://codereview.chromium.org/605243002

Cr-Commit-Position: refs/heads/master@{#296981}
parent 063dbc21
...@@ -2945,14 +2945,27 @@ ...@@ -2945,14 +2945,27 @@
'conditions': [ 'conditions': [
['archive_gpu_tests==1', { ['archive_gpu_tests==1', {
'targets': [ 'targets': [
{
'target_name': 'gpu_tests_base',
'type': 'none',
'dependencies': [
# depend on icu to fix races. http://crbug.com/417583
'../third_party/icu/icu.gyp:icudata',
],
'direct_dependent_settings': {
'includes': [
'../build/isolate.gypi',
],
},
},
{ {
'target_name': 'angle_unittests_run', 'target_name': 'angle_unittests_run',
'type': 'none', 'type': 'none',
'dependencies': [ 'dependencies': [
'../gpu/gpu.gyp:angle_unittests', '../gpu/gpu.gyp:angle_unittests',
'gpu_tests_base',
], ],
'includes': [ 'includes': [
'../build/isolate.gypi',
'angle_unittests.isolate', 'angle_unittests.isolate',
], ],
'sources': [ 'sources': [
...@@ -2964,9 +2977,9 @@ ...@@ -2964,9 +2977,9 @@
'type': 'none', 'type': 'none',
'dependencies': [ 'dependencies': [
'../gpu/gpu.gyp:gl_tests', '../gpu/gpu.gyp:gl_tests',
'gpu_tests_base',
], ],
'includes': [ 'includes': [
'../build/isolate.gypi',
'gl_tests.isolate', 'gl_tests.isolate',
], ],
'sources': [ 'sources': [
...@@ -2978,9 +2991,9 @@ ...@@ -2978,9 +2991,9 @@
'type': 'none', 'type': 'none',
'dependencies': [ 'dependencies': [
'browser_tests_run', 'browser_tests_run',
'gpu_tests_base',
], ],
'includes': [ 'includes': [
'../build/isolate.gypi',
'tab_capture_end2end_tests.isolate', 'tab_capture_end2end_tests.isolate',
], ],
'sources': [ 'sources': [
...@@ -2993,9 +3006,9 @@ ...@@ -2993,9 +3006,9 @@
'dependencies': [ 'dependencies': [
'chrome_run', 'chrome_run',
'../tools/telemetry/telemetry.gyp:bitmaptools#host', '../tools/telemetry/telemetry.gyp:bitmaptools#host',
'gpu_tests_base',
], ],
'includes': [ 'includes': [
'../build/isolate.gypi',
'telemetry_gpu_test.isolate', 'telemetry_gpu_test.isolate',
], ],
'sources': [ 'sources': [
...@@ -3007,9 +3020,9 @@ ...@@ -3007,9 +3020,9 @@
'type': 'none', 'type': 'none',
'dependencies': [ 'dependencies': [
'../gpu/gpu.gyp:gpu_unittests', '../gpu/gpu.gyp:gpu_unittests',
'gpu_tests_base',
], ],
'includes': [ 'includes': [
'../build/isolate.gypi',
'gpu_unittests.isolate', 'gpu_unittests.isolate',
], ],
'sources': [ 'sources': [
...@@ -3025,9 +3038,9 @@ ...@@ -3025,9 +3038,9 @@
'type': 'none', 'type': 'none',
'dependencies': [ 'dependencies': [
'../gpu/gles2_conform_support/gles2_conform_test.gyp:gles2_conform_test', '../gpu/gles2_conform_support/gles2_conform_test.gyp:gles2_conform_test',
'gpu_tests_base',
], ],
'includes': [ 'includes': [
'../build/isolate.gypi',
'gles2_conform_test.isolate', 'gles2_conform_test.isolate',
], ],
'sources': [ 'sources': [
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment