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

Side by Side Diff: gpu/gpu.gyp

Issue 18161007: Replace angle_path gyp variable with regular path. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@d3d11
Patch Set: rebase Created 7 years, 5 months 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') | media/media.gyp » ('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 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
118 ], 118 ],
119 }, 119 },
120 { 120 {
121 'target_name': 'gpu_unittests', 121 'target_name': 'gpu_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 '<(angle_path)/src/build_angle.gyp:translator_glsl', 128 '../third_party/angle_dx11/src/build_angle.gyp:translator_glsl',
129 '../ui/gl/gl.gyp:gl', 129 '../ui/gl/gl.gyp:gl',
130 '../ui/ui.gyp:ui', 130 '../ui/ui.gyp:ui',
131 'command_buffer/command_buffer.gyp:gles2_utils', 131 'command_buffer/command_buffer.gyp:gles2_utils',
132 'command_buffer_client', 132 'command_buffer_client',
133 'command_buffer_common', 133 'command_buffer_common',
134 'command_buffer_service', 134 'command_buffer_service',
135 'gpu', 135 'gpu',
136 'gpu_unittest_utils', 136 'gpu_unittest_utils',
137 'gles2_implementation_client_side_arrays', 137 'gles2_implementation_client_side_arrays',
138 'gles2_cmd_helper', 138 'gles2_cmd_helper',
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
246 'msvs_disabled_warnings': [ 4267, ], 246 'msvs_disabled_warnings': [ 4267, ],
247 }, 247 },
248 { 248 {
249 'target_name': 'gl_tests', 249 'target_name': 'gl_tests',
250 'type': '<(gtest_target_type)', 250 'type': '<(gtest_target_type)',
251 'dependencies': [ 251 'dependencies': [
252 '../base/base.gyp:base', 252 '../base/base.gyp:base',
253 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations', 253 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations',
254 '../testing/gmock.gyp:gmock', 254 '../testing/gmock.gyp:gmock',
255 '../testing/gtest.gyp:gtest', 255 '../testing/gtest.gyp:gtest',
256 '<(angle_path)/src/build_angle.gyp:translator_glsl', 256 '../third_party/angle_dx11/src/build_angle.gyp:translator_glsl',
257 '../ui/ui.gyp:ui', 257 '../ui/ui.gyp:ui',
258 'command_buffer/command_buffer.gyp:gles2_utils', 258 'command_buffer/command_buffer.gyp:gles2_utils',
259 'command_buffer_client', 259 'command_buffer_client',
260 'command_buffer_common', 260 'command_buffer_common',
261 'command_buffer_service', 261 'command_buffer_service',
262 'gpu', 262 'gpu',
263 'gpu_unittest_utils', 263 'gpu_unittest_utils',
264 'gles2_implementation_client_side_arrays', 264 'gles2_implementation_client_side_arrays',
265 'gles2_cmd_helper', 265 'gles2_cmd_helper',
266 #'gl_unittests', 266 #'gl_unittests',
(...skipping 279 matching lines...) Expand 10 before | Expand all | Expand 10 after
546 'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)gl_tests< (SHARED_LIB_SUFFIX)', 546 'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)gl_tests< (SHARED_LIB_SUFFIX)',
547 }, 547 },
548 'includes': [ 548 'includes': [
549 '../build/apk_test.gypi', 549 '../build/apk_test.gypi',
550 ], 550 ],
551 }, 551 },
552 ], 552 ],
553 }], 553 }],
554 ], 554 ],
555 } 555 }
OLDNEW
« no previous file with comments | « gpu/command_buffer_service.gypi ('k') | media/media.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698