diff options
| author | Andras Becsi <andras.becsi@digia.com> | 2014-03-18 13:16:26 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-03-20 15:55:39 +0100 |
| commit | 3f0f86b0caed75241fa71c95a5d73bc0164348c5 (patch) | |
| tree | 92b9fb00f2e9e90b0be2262093876d4f43b6cd13 /chromium/gpu/gpu.gyp | |
| parent | e90d7c4b152c56919d963987e2503f9909a666d2 (diff) | |
Update to new stable branch 1750
This also includes an updated ninja and chromium dependencies
needed on Windows.
Change-Id: Icd597d80ed3fa4425933c9f1334c3c2e31291c42
Reviewed-by: Zoltan Arvai <zarvai@inf.u-szeged.hu>
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
Diffstat (limited to 'chromium/gpu/gpu.gyp')
| -rw-r--r-- | chromium/gpu/gpu.gyp | 46 |
1 files changed, 38 insertions, 8 deletions
diff --git a/chromium/gpu/gpu.gyp b/chromium/gpu/gpu.gyp index 15996237f10..c3c9502c724 100644 --- a/chromium/gpu/gpu.gyp +++ b/chromium/gpu/gpu.gyp @@ -19,7 +19,7 @@ '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', '../third_party/khronos/khronos.gyp:khronos_headers', '../ui/gl/gl.gyp:gl', - '../ui/ui.gyp:ui', + '../ui/gfx/gfx.gyp:gfx', 'command_buffer/command_buffer.gyp:gles2_utils', 'gles2_cmd_helper', ], @@ -49,6 +49,7 @@ '../base/base.gyp:base', '../third_party/khronos/khronos.gyp:khronos_headers', '../ui/gl/gl.gyp:gl', + '../ui/gfx/gfx.gyp:gfx', 'command_buffer/command_buffer.gyp:gles2_utils', 'gles2_cmd_helper', ], @@ -70,6 +71,7 @@ 'dependencies': [ '../base/base.gyp:base', '../third_party/khronos/khronos.gyp:khronos_headers', + '../ui/gfx/gfx.gyp:gfx', 'command_buffer/command_buffer.gyp:gles2_utils', 'gles2_cmd_helper', ], @@ -127,16 +129,45 @@ ], }, { + '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', + '<(angle_path)/src/build_angle.gyp:translator_static', + ], + 'variables': { + 'ANGLE_DIR': '<(angle_path)', + }, + 'includes': [ + '../third_party/angle/tests/preprocessor_tests/preprocessor_tests.gypi', + '../third_party/angle/tests/compiler_tests/compiler_tests.gypi', + ], + 'include_dirs': [ + '..', + '<(angle_path)/include', + '<(angle_path)/src', + '<(angle_path)/src/compiler/preprocessor', + '<(angle_path)/tests', + ], + 'sources': [ + 'angle_unittest_main.cc', + ], + }, + { 'target_name': 'gpu_unittests', 'type': '<(gtest_target_type)', 'dependencies': [ '../base/base.gyp:base', + '../base/base.gyp:test_support_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_glsl', + '<(angle_path)/src/build_angle.gyp:translator', '../ui/gl/gl.gyp:gl', - '../ui/ui.gyp:ui', + '../ui/gfx/gfx.gyp:gfx', 'command_buffer/command_buffer.gyp:gles2_utils', 'command_buffer_client', 'command_buffer_common', @@ -156,8 +187,6 @@ 'command_buffer/client/client_test_helper.h', 'command_buffer/client/cmd_buffer_helper_test.cc', 'command_buffer/client/fenced_allocator_test.cc', - 'command_buffer/client/gles2_interface_stub.cc', - 'command_buffer/client/gles2_interface_stub.h', 'command_buffer/client/gles2_implementation_unittest.cc', 'command_buffer/client/mapped_memory_unittest.cc', 'command_buffer/client/query_tracker_unittest.cc', @@ -232,7 +261,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', @@ -261,8 +289,8 @@ '../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_glsl', - '../ui/ui.gyp:ui', + '<(angle_path)/src/build_angle.gyp:translator', + '../ui/gfx/gfx.gyp:gfx', 'command_buffer/command_buffer.gyp:gles2_utils', 'command_buffer_client', 'command_buffer_common', @@ -330,6 +358,8 @@ 'sources': [ 'command_buffer/service/gles2_cmd_decoder_mock.cc', 'command_buffer/service/error_state_mock.cc', + 'command_buffer/client/gles2_interface_stub.cc', + 'command_buffer/client/gles2_interface_stub.h', ], }, ], |