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

Side by Side Diff: gpu/gpu.gyp

Issue 761903003: Update from https://crrev.com/306655 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 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/gles2_conform_support/egl/display.cc ('k') | gpu/ipc/gpu_command_buffer_traits.h » ('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 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
121 'sources': [ 121 'sources': [
122 '<@(gles2_c_lib_source_files)', 122 '<@(gles2_c_lib_source_files)',
123 ], 123 ],
124 }, 124 },
125 { 125 {
126 # GN version: //gpu:angle_unittests 126 # GN version: //gpu:angle_unittests
127 'target_name': 'angle_unittests', 127 'target_name': 'angle_unittests',
128 'type': '<(gtest_target_type)', 128 'type': '<(gtest_target_type)',
129 'dependencies': [ 129 'dependencies': [
130 '../base/base.gyp:base', 130 '../base/base.gyp:base',
131 '../base/base.gyp:test_support_base',
131 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations', 132 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations',
132 '../testing/gmock.gyp:gmock', 133 '../testing/gmock.gyp:gmock',
133 '../testing/gtest.gyp:gtest', 134 '../testing/gtest.gyp:gtest',
134 '<(angle_path)/src/angle.gyp:translator_static', 135 '<(angle_path)/src/angle.gyp:translator_static',
135 ], 136 ],
136 'variables': { 137 'variables': {
137 'ANGLE_DIR': '<(angle_path)', 138 'ANGLE_DIR': '<(angle_path)',
138 }, 139 },
139 'includes': [ 140 'includes': [
140 '../third_party/angle/tests/preprocessor_tests/preprocessor_tests.gypi', 141 '../third_party/angle/tests/preprocessor_tests/preprocessor_tests.gypi',
(...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after
286 ], 287 ],
287 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 288 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
288 'msvs_disabled_warnings': [ 4267, ], 289 'msvs_disabled_warnings': [ 4267, ],
289 }, 290 },
290 { 291 {
291 # GN version: //gpu:gl_tests 292 # GN version: //gpu:gl_tests
292 'target_name': 'gl_tests', 293 'target_name': 'gl_tests',
293 'type': '<(gtest_target_type)', 294 'type': '<(gtest_target_type)',
294 'dependencies': [ 295 'dependencies': [
295 '../base/base.gyp:base', 296 '../base/base.gyp:base',
297 '../base/base.gyp:test_support_base',
296 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations', 298 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations',
297 '../testing/gmock.gyp:gmock', 299 '../testing/gmock.gyp:gmock',
298 '../testing/gtest.gyp:gtest', 300 '../testing/gtest.gyp:gtest',
299 '<(angle_path)/src/angle.gyp:translator', 301 '<(angle_path)/src/angle.gyp:translator',
300 '../ui/gfx/gfx.gyp:gfx', 302 '../ui/gfx/gfx.gyp:gfx',
301 '../ui/gfx/gfx.gyp:gfx_test_support', 303 '../ui/gfx/gfx.gyp:gfx_test_support',
302 '../ui/gfx/gfx.gyp:gfx_geometry', 304 '../ui/gfx/gfx.gyp:gfx_geometry',
303 '../ui/gl/gl.gyp:gl', 305 '../ui/gl/gl.gyp:gl',
304 'command_buffer/command_buffer.gyp:gles2_utils', 306 'command_buffer/command_buffer.gyp:gles2_utils',
305 'command_buffer_client', 307 'command_buffer_client',
(...skipping 346 matching lines...) Expand 10 before | Expand all | Expand 10 after
652 ], 654 ],
653 'variables': { 655 'variables': {
654 'test_suite_name': 'gpu_unittests', 656 'test_suite_name': 'gpu_unittests',
655 }, 657 },
656 'includes': [ '../build/apk_test.gypi' ], 658 'includes': [ '../build/apk_test.gypi' ],
657 }, 659 },
658 ], 660 ],
659 }], 661 }],
660 ], 662 ],
661 } 663 }
OLDNEW
« no previous file with comments | « gpu/gles2_conform_support/egl/display.cc ('k') | gpu/ipc/gpu_command_buffer_traits.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698