diff options
| author | Torne (Richard Coles) <torne@google.com> | 2013-11-28 11:55:43 +0000 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2013-11-28 11:55:43 +0000 |
| commit | f2477e01787aa58f445919b809d89e252beef54f (patch) | |
| tree | 2db962b4af39f0db3a5f83b314373d0530c484b8 /gpu/gpu.gyp | |
| parent | 7daea1dd5ff7e419322de831b642d81af3247912 (diff) | |
| download | chromium_org-f2477e01787aa58f445919b809d89e252beef54f.tar.gz | |
Merge from Chromium at DEPS revision 237746
This commit was generated by merge_to_master.py.
Change-Id: I8997af4cddfeb09a7c26f7e8e672c712cab461ea
Diffstat (limited to 'gpu/gpu.gyp')
| -rw-r--r-- | gpu/gpu.gyp | 29 |
1 files changed, 28 insertions, 1 deletions
diff --git a/gpu/gpu.gyp b/gpu/gpu.gyp index fd7cac88cd..72c27571ca 100644 --- a/gpu/gpu.gyp +++ b/gpu/gpu.gyp @@ -118,6 +118,34 @@ ], }, { + 'target_name': 'angle_unittests', + 'type': '<(gtest_target_type)', + 'dependencies': [ + '../base/base.gyp:base', + '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', + '../testing/gmock.gyp:gmock', + '../testing/gtest.gyp:gtest', + '../third_party/angle_dx11/src/build_angle.gyp:translator_static', + ], + 'variables': { + 'ANGLE_DIR': '../third_party/angle_dx11', + }, + 'includes': [ + '../third_party/angle_dx11/tests/preprocessor_tests/preprocessor_tests.gypi', + '../third_party/angle_dx11/tests/compiler_tests/compiler_tests.gypi', + ], + 'include_dirs': [ + '..', + '../third_party/angle_dx11/include', + '../third_party/angle_dx11/src', + '../third_party/angle_dx11/src/compiler/preprocessor', + '../third_party/angle_dx11/tests', + ], + 'sources': [ + 'angle_unittest_main.cc', + ], + }, + { 'target_name': 'gpu_unittests', 'type': '<(gtest_target_type)', 'dependencies': [ @@ -224,7 +252,6 @@ 'config/gpu_driver_bug_list_unittest.cc', 'config/gpu_info_collector_unittest.cc', 'config/gpu_info_unittest.cc', - 'config/gpu_switching_list_unittest.cc', 'config/gpu_test_config_unittest.cc', 'config/gpu_test_expectations_parser_unittest.cc', 'config/gpu_util_unittest.cc', |