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

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
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 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
118 ], 118 ],
119 }, 119 },
120 { 120 {
121 'target_name': 'angle_unittests', 121 'target_name': 'angle_unittests',
122 'type': '<(gtest_target_type)', 122 'type': '<(gtest_target_type)',
123 'dependencies': [ 123 'dependencies': [
124 '../base/base.gyp:base', 124 '../base/base.gyp:base',
125 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations', 125 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations',
126 '../testing/gmock.gyp:gmock', 126 '../testing/gmock.gyp:gmock',
127 '../testing/gtest.gyp:gtest', 127 '../testing/gtest.gyp:gtest',
128 '../third_party/angle_dx11/src/build_angle.gyp:translator_static', 128 '../third_party/angle/src/build_angle.gyp:translator_static',
Zhenyao Mo 2013/12/09 20:18:34 use angle_path
129 ], 129 ],
130 'variables': { 130 'variables': {
131 'ANGLE_DIR': '../third_party/angle_dx11', 131 'ANGLE_DIR': '../third_party/angle',
132 }, 132 },
133 'includes': [ 133 'includes': [
134 '../third_party/angle_dx11/tests/preprocessor_tests/preprocessor_tests.g ypi', 134 '../third_party/angle/tests/preprocessor_tests/preprocessor_tests.gypi',
135 '../third_party/angle_dx11/tests/compiler_tests/compiler_tests.gypi', 135 '../third_party/angle/tests/compiler_tests/compiler_tests.gypi',
136 ], 136 ],
137 'include_dirs': [ 137 'include_dirs': [
138 '..', 138 '..',
139 '../third_party/angle_dx11/include', 139 '../third_party/angle/include',
140 '../third_party/angle_dx11/src', 140 '../third_party/angle/src',
141 '../third_party/angle_dx11/src/compiler/preprocessor', 141 '../third_party/angle/src/compiler/preprocessor',
142 '../third_party/angle_dx11/tests', 142 '../third_party/angle/tests',
143 ], 143 ],
144 'sources': [ 144 'sources': [
145 'angle_unittest_main.cc', 145 'angle_unittest_main.cc',
146 ], 146 ],
147 }, 147 },
148 { 148 {
149 'target_name': 'gpu_unittests', 149 'target_name': 'gpu_unittests',
150 'type': '<(gtest_target_type)', 150 'type': '<(gtest_target_type)',
151 'dependencies': [ 151 'dependencies': [
152 '../base/base.gyp:base', 152 '../base/base.gyp:base',
153 '../base/base.gyp:test_support_base', 153 '../base/base.gyp:test_support_base',
154 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations', 154 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations',
155 '../testing/gmock.gyp:gmock', 155 '../testing/gmock.gyp:gmock',
156 '../testing/gtest.gyp:gtest', 156 '../testing/gtest.gyp:gtest',
157 '../third_party/angle_dx11/src/build_angle.gyp:translator', 157 '../third_party/angle/src/build_angle.gyp:translator',
158 '../ui/gl/gl.gyp:gl', 158 '../ui/gl/gl.gyp:gl',
159 '../ui/gfx/gfx.gyp:gfx', 159 '../ui/gfx/gfx.gyp:gfx',
160 'command_buffer/command_buffer.gyp:gles2_utils', 160 'command_buffer/command_buffer.gyp:gles2_utils',
161 'command_buffer_client', 161 'command_buffer_client',
162 'command_buffer_common', 162 'command_buffer_common',
163 'command_buffer_service', 163 'command_buffer_service',
164 'gpu', 164 'gpu',
165 'gpu_unittest_utils', 165 'gpu_unittest_utils',
166 'gles2_implementation_client_side_arrays', 166 'gles2_implementation_client_side_arrays',
167 'gles2_cmd_helper', 167 'gles2_cmd_helper',
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
271 'msvs_disabled_warnings': [ 4267, ], 271 'msvs_disabled_warnings': [ 4267, ],
272 }, 272 },
273 { 273 {
274 'target_name': 'gl_tests', 274 'target_name': 'gl_tests',
275 'type': '<(gtest_target_type)', 275 'type': '<(gtest_target_type)',
276 'dependencies': [ 276 'dependencies': [
277 '../base/base.gyp:base', 277 '../base/base.gyp:base',
278 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations', 278 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations',
279 '../testing/gmock.gyp:gmock', 279 '../testing/gmock.gyp:gmock',
280 '../testing/gtest.gyp:gtest', 280 '../testing/gtest.gyp:gtest',
281 '../third_party/angle_dx11/src/build_angle.gyp:translator', 281 '../third_party/angle/src/build_angle.gyp:translator',
282 '../ui/gfx/gfx.gyp:gfx', 282 '../ui/gfx/gfx.gyp:gfx',
283 'command_buffer/command_buffer.gyp:gles2_utils', 283 'command_buffer/command_buffer.gyp:gles2_utils',
284 'command_buffer_client', 284 'command_buffer_client',
285 'command_buffer_common', 285 'command_buffer_common',
286 'command_buffer_service', 286 'command_buffer_service',
287 'gpu', 287 'gpu',
288 'gpu_unittest_utils', 288 'gpu_unittest_utils',
289 'gles2_implementation_client_side_arrays', 289 'gles2_implementation_client_side_arrays',
290 'gles2_cmd_helper', 290 'gles2_cmd_helper',
291 #'gl_unittests', 291 #'gl_unittests',
(...skipping 278 matching lines...) Expand 10 before | Expand all | Expand 10 after
570 'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)gl_tests< (SHARED_LIB_SUFFIX)', 570 'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)gl_tests< (SHARED_LIB_SUFFIX)',
571 }, 571 },
572 'includes': [ 572 'includes': [
573 '../build/apk_test.gypi', 573 '../build/apk_test.gypi',
574 ], 574 ],
575 }, 575 },
576 ], 576 ],
577 }], 577 }],
578 ], 578 ],
579 } 579 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698