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

Side by Side Diff: gpu/gpu.gyp

Issue 140263002: Fixes to make GPU tests run in isolated mode. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Cleanups. Created 6 years, 11 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 | Annotate | Revision Log
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 317 matching lines...) Expand 10 before | Expand all | Expand 10 after
328 'command_buffer/tests/gl_unittests_android.cc', 328 'command_buffer/tests/gl_unittests_android.cc',
329 'command_buffer/tests/gl_virtual_contexts_unittests.cc', 329 'command_buffer/tests/gl_virtual_contexts_unittests.cc',
330 'command_buffer/tests/occlusion_query_unittests.cc', 330 'command_buffer/tests/occlusion_query_unittests.cc',
331 ], 331 ],
332 'conditions': [ 332 'conditions': [
333 ['OS == "android" and gtest_target_type == "shared_library"', { 333 ['OS == "android" and gtest_target_type == "shared_library"', {
334 'dependencies': [ 334 'dependencies': [
335 '../testing/android/native_test.gyp:native_test_native_code', 335 '../testing/android/native_test.gyp:native_test_native_code',
336 ], 336 ],
337 }], 337 }],
338 ['OS == "win"', {
339 'dependencies': [
340 '../third_party/angle/src/build_angle.gyp:libEGL',
341 '../third_party/angle/src/build_angle.gyp:libGLESv2',
342 ],
343 }],
338 ], 344 ],
339 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 345 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
340 'msvs_disabled_warnings': [ 4267, ], 346 'msvs_disabled_warnings': [ 4267, ],
341 }, 347 },
342 { 348 {
343 'target_name': 'gpu_unittest_utils', 349 'target_name': 'gpu_unittest_utils',
344 'type': 'static_library', 350 'type': 'static_library',
345 'dependencies': [ 351 'dependencies': [
346 '../testing/gmock.gyp:gmock', 352 '../testing/gmock.gyp:gmock',
347 '../testing/gtest.gyp:gtest', 353 '../testing/gtest.gyp:gtest',
(...skipping 230 matching lines...) Expand 10 before | Expand all | Expand 10 after
578 'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)gl_tests< (SHARED_LIB_SUFFIX)', 584 'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)gl_tests< (SHARED_LIB_SUFFIX)',
579 }, 585 },
580 'includes': [ 586 'includes': [
581 '../build/apk_test.gypi', 587 '../build/apk_test.gypi',
582 ], 588 ],
583 }, 589 },
584 ], 590 ],
585 }], 591 }],
586 ], 592 ],
587 } 593 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698