| OLD | NEW |
| 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 280 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 291 '../testing/perf/perf_test.gyp:perf_test', | 291 '../testing/perf/perf_test.gyp:perf_test', |
| 292 '../ui/gfx/gfx.gyp:gfx_geometry', | 292 '../ui/gfx/gfx.gyp:gfx_geometry', |
| 293 '../ui/gl/gl.gyp:gl', | 293 '../ui/gl/gl.gyp:gl', |
| 294 'command_buffer_service', | 294 'command_buffer_service', |
| 295 ], | 295 ], |
| 296 'sources': [ | 296 'sources': [ |
| 297 'perftests/measurements.cc', | 297 'perftests/measurements.cc', |
| 298 'perftests/run_all_tests.cc', | 298 'perftests/run_all_tests.cc', |
| 299 'perftests/texture_upload_perftest.cc', | 299 'perftests/texture_upload_perftest.cc', |
| 300 ], | 300 ], |
| 301 'conditions': [ |
| 302 ['OS == "android"', |
| 303 { |
| 304 'dependencies': [ |
| 305 '../testing/android/native_test.gyp:native_test_native_code', |
| 306 ], |
| 307 } |
| 308 ], |
| 309 # See http://crbug.com/162998#c4 for why this is needed. |
| 310 ['OS=="linux" and use_allocator!="none"', |
| 311 { |
| 312 'dependencies': [ |
| 313 '../base/allocator/allocator.gyp:allocator', |
| 314 ], |
| 315 } |
| 316 ], |
| 317 ], |
| 301 }, | 318 }, |
| 302 { | 319 { |
| 303 # GN version: //gpu:gl_tests | 320 # GN version: //gpu:gl_tests |
| 304 'target_name': 'gl_tests', | 321 'target_name': 'gl_tests', |
| 305 'type': '<(gtest_target_type)', | 322 'type': '<(gtest_target_type)', |
| 306 'dependencies': [ | 323 'dependencies': [ |
| 307 '../base/base.gyp:base', | 324 '../base/base.gyp:base', |
| 308 '../base/base.gyp:test_support_base', | 325 '../base/base.gyp:test_support_base', |
| 309 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic
_annotations', | 326 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic
_annotations', |
| 310 '../testing/gmock.gyp:gmock', | 327 '../testing/gmock.gyp:gmock', |
| (...skipping 350 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 661 'target_name': 'gpu_unittests_apk', | 678 'target_name': 'gpu_unittests_apk', |
| 662 'type': 'none', | 679 'type': 'none', |
| 663 'dependencies': [ | 680 'dependencies': [ |
| 664 'gpu_unittests', | 681 'gpu_unittests', |
| 665 ], | 682 ], |
| 666 'variables': { | 683 'variables': { |
| 667 'test_suite_name': 'gpu_unittests', | 684 'test_suite_name': 'gpu_unittests', |
| 668 }, | 685 }, |
| 669 'includes': [ '../build/apk_test.gypi' ], | 686 'includes': [ '../build/apk_test.gypi' ], |
| 670 }, | 687 }, |
| 688 { |
| 689 'target_name': 'gpu_perftests_apk', |
| 690 'type': 'none', |
| 691 'dependencies': [ |
| 692 'gpu_perftests', |
| 693 ], |
| 694 'variables': { |
| 695 'test_suite_name': 'gpu_perftests', |
| 696 }, |
| 697 'includes': [ '../build/apk_test.gypi' ], |
| 698 }, |
| 671 ], | 699 ], |
| 672 }], | 700 }], |
| 673 ['OS == "win"', { | 701 ['OS == "win"', { |
| 674 'targets': [ | 702 'targets': [ |
| 675 { | 703 { |
| 676 # TODO(kbr): port this target to the GN build. | 704 # TODO(kbr): port this target to the GN build. |
| 677 'target_name': 'angle_end2end_tests', | 705 'target_name': 'angle_end2end_tests', |
| 678 'type': '<(gtest_target_type)', | 706 'type': '<(gtest_target_type)', |
| 679 'dependencies': [ | 707 'dependencies': [ |
| 680 '../base/base.gyp:base', | 708 '../base/base.gyp:base', |
| (...skipping 23 matching lines...) Expand all Loading... |
| 704 '../build/isolate.gypi', | 732 '../build/isolate.gypi', |
| 705 ], | 733 ], |
| 706 'sources': [ | 734 'sources': [ |
| 707 'gpu_unittests.isolate', | 735 'gpu_unittests.isolate', |
| 708 ], | 736 ], |
| 709 }, | 737 }, |
| 710 ], | 738 ], |
| 711 }], | 739 }], |
| 712 ], | 740 ], |
| 713 } | 741 } |
| OLD | NEW |