Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(218)

Side by Side Diff: gpu/gpu.gyp

Issue 106623003: Update dependencies to use new angle repository. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 7 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « gpu/command_buffer_service.gypi ('k') | tools/bisect-perf-regression.py » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 'nacl_win64_target': 0, 7 'nacl_win64_target': 0,
8 }, 8 },
9 'includes': [ 9 'includes': [
10 'gpu_common.gypi', 10 'gpu_common.gypi',
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
120 ], 120 ],
121 }, 121 },
122 { 122 {
123 'target_name': 'angle_unittests', 123 'target_name': 'angle_unittests',
124 'type': '<(gtest_target_type)', 124 'type': '<(gtest_target_type)',
125 'dependencies': [ 125 'dependencies': [
126 '../base/base.gyp:base', 126 '../base/base.gyp:base',
127 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations', 127 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations',
128 '../testing/gmock.gyp:gmock', 128 '../testing/gmock.gyp:gmock',
129 '../testing/gtest.gyp:gtest', 129 '../testing/gtest.gyp:gtest',
130 '../third_party/angle_dx11/src/build_angle.gyp:translator_static', 130 '<(angle_path)/src/build_angle.gyp:translator_static',
131 ], 131 ],
132 'variables': { 132 'variables': {
133 'ANGLE_DIR': '../third_party/angle_dx11', 133 'ANGLE_DIR': '<(angle_path)',
134 }, 134 },
135 'includes': [ 135 'includes': [
136 '../third_party/angle_dx11/tests/preprocessor_tests/preprocessor_tests.g ypi', 136 '../third_party/angle/tests/preprocessor_tests/preprocessor_tests.gypi',
137 '../third_party/angle_dx11/tests/compiler_tests/compiler_tests.gypi', 137 '../third_party/angle/tests/compiler_tests/compiler_tests.gypi',
138 ], 138 ],
139 'include_dirs': [ 139 'include_dirs': [
140 '..', 140 '..',
141 '../third_party/angle_dx11/include', 141 '<(angle_path)/include',
142 '../third_party/angle_dx11/src', 142 '<(angle_path)/src',
143 '../third_party/angle_dx11/src/compiler/preprocessor', 143 '<(angle_path)/src/compiler/preprocessor',
144 '../third_party/angle_dx11/tests', 144 '<(angle_path)/tests',
145 ], 145 ],
146 'sources': [ 146 'sources': [
147 'angle_unittest_main.cc', 147 'angle_unittest_main.cc',
148 ], 148 ],
149 }, 149 },
150 { 150 {
151 'target_name': 'gpu_unittests', 151 'target_name': 'gpu_unittests',
152 'type': '<(gtest_target_type)', 152 'type': '<(gtest_target_type)',
153 'dependencies': [ 153 'dependencies': [
154 '../base/base.gyp:base', 154 '../base/base.gyp:base',
155 '../base/base.gyp:test_support_base', 155 '../base/base.gyp:test_support_base',
156 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations', 156 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations',
157 '../testing/gmock.gyp:gmock', 157 '../testing/gmock.gyp:gmock',
158 '../testing/gtest.gyp:gtest', 158 '../testing/gtest.gyp:gtest',
159 '../third_party/angle_dx11/src/build_angle.gyp:translator', 159 '<(angle_path)/src/build_angle.gyp:translator',
160 '../ui/gl/gl.gyp:gl', 160 '../ui/gl/gl.gyp:gl',
161 '../ui/gfx/gfx.gyp:gfx', 161 '../ui/gfx/gfx.gyp:gfx',
162 'command_buffer/command_buffer.gyp:gles2_utils', 162 'command_buffer/command_buffer.gyp:gles2_utils',
163 'command_buffer_client', 163 'command_buffer_client',
164 'command_buffer_common', 164 'command_buffer_common',
165 'command_buffer_service', 165 'command_buffer_service',
166 'gpu', 166 'gpu',
167 'gpu_unittest_utils', 167 'gpu_unittest_utils',
168 'gles2_implementation_client_side_arrays', 168 'gles2_implementation_client_side_arrays',
169 'gles2_cmd_helper', 169 'gles2_cmd_helper',
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
273 'msvs_disabled_warnings': [ 4267, ], 273 'msvs_disabled_warnings': [ 4267, ],
274 }, 274 },
275 { 275 {
276 'target_name': 'gl_tests', 276 'target_name': 'gl_tests',
277 'type': '<(gtest_target_type)', 277 'type': '<(gtest_target_type)',
278 'dependencies': [ 278 'dependencies': [
279 '../base/base.gyp:base', 279 '../base/base.gyp:base',
280 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations', 280 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations',
281 '../testing/gmock.gyp:gmock', 281 '../testing/gmock.gyp:gmock',
282 '../testing/gtest.gyp:gtest', 282 '../testing/gtest.gyp:gtest',
283 '../third_party/angle_dx11/src/build_angle.gyp:translator', 283 '<(angle_path)/src/build_angle.gyp:translator',
284 '../ui/gfx/gfx.gyp:gfx', 284 '../ui/gfx/gfx.gyp:gfx',
285 'command_buffer/command_buffer.gyp:gles2_utils', 285 'command_buffer/command_buffer.gyp:gles2_utils',
286 'command_buffer_client', 286 'command_buffer_client',
287 'command_buffer_common', 287 'command_buffer_common',
288 'command_buffer_service', 288 'command_buffer_service',
289 'gpu', 289 'gpu',
290 'gpu_unittest_utils', 290 'gpu_unittest_utils',
291 'gles2_implementation_client_side_arrays', 291 'gles2_implementation_client_side_arrays',
292 'gles2_cmd_helper', 292 'gles2_cmd_helper',
293 #'gl_unittests', 293 #'gl_unittests',
(...skipping 278 matching lines...) Expand 10 before | Expand all | Expand 10 after
572 'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)gl_tests< (SHARED_LIB_SUFFIX)', 572 'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)gl_tests< (SHARED_LIB_SUFFIX)',
573 }, 573 },
574 'includes': [ 574 'includes': [
575 '../build/apk_test.gypi', 575 '../build/apk_test.gypi',
576 ], 576 ],
577 }, 577 },
578 ], 578 ],
579 }], 579 }],
580 ], 580 ],
581 } 581 }
OLDNEW
« no previous file with comments | « gpu/command_buffer_service.gypi ('k') | tools/bisect-perf-regression.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698