| Index: chrome/chrome_tests.gypi
|
| diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
|
| index cf2a5b7e002930b12b8d7bd5fa35933e950a9ae1..1b357c2e60e39f70c2b3fbdbfd53ef090d08140b 100644
|
| --- a/chrome/chrome_tests.gypi
|
| +++ b/chrome/chrome_tests.gypi
|
| @@ -3231,6 +3231,36 @@
|
| ],
|
| },
|
| {
|
| + 'target_name': 'gpu_tests_base',
|
| + 'type': 'none',
|
| + 'dependencies': [
|
| + # depend on icu to fix races. http://crbug.com/417583
|
| + '../third_party/icu/icu.gyp:icudata',
|
| + ],
|
| + # Set this so we aren't included as a target in files that
|
| + # include this file via a wildcard (such as chrome_tests.gypi).
|
| + # If we didn't do this the All target ends up with a rule that
|
| + # makes it unnecessarily compile in certain situations.
|
| + 'suppress_wildcard': 1,
|
| + 'direct_dependent_settings': {
|
| + 'includes': [
|
| + '../build/isolate.gypi',
|
| + ],
|
| + },
|
| + },
|
| + {
|
| + # GN: //gpu:angle_unittests_run
|
| + 'target_name': 'angle_unittests_run',
|
| + 'type': 'none',
|
| + 'dependencies': [
|
| + '../gpu/gpu.gyp:angle_unittests',
|
| + 'gpu_tests_base',
|
| + ],
|
| + 'sources': [
|
| + 'angle_unittests.isolate',
|
| + ],
|
| + },
|
| + {
|
| 'target_name': 'browser_tests_run',
|
| 'type': 'none',
|
| 'dependencies': [
|
| @@ -3358,36 +3388,6 @@
|
| ['archive_gpu_tests==1', {
|
| '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',
|
| - ],
|
| - # Set this so we aren't included as a target in files that
|
| - # include this file via a wildcard (such as chrome_tests.gypi).
|
| - # If we didn't do this the All target ends up with a rule that
|
| - # makes it unnecessarily compile in certain situations.
|
| - 'suppress_wildcard': 1,
|
| - 'direct_dependent_settings': {
|
| - 'includes': [
|
| - '../build/isolate.gypi',
|
| - ],
|
| - },
|
| - },
|
| - {
|
| - # GN: //gpu:angle_unittests_run
|
| - 'target_name': 'angle_unittests_run',
|
| - 'type': 'none',
|
| - 'dependencies': [
|
| - '../gpu/gpu.gyp:angle_unittests',
|
| - 'gpu_tests_base',
|
| - ],
|
| - 'sources': [
|
| - 'angle_unittests.isolate',
|
| - ],
|
| - },
|
| - {
|
| # GN: //gpu:gl_tests_run
|
| 'target_name': 'gl_tests_run',
|
| 'type': 'none',
|
|
|