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

Side by Side Diff: gpu/gpu.gyp

Issue 1640243002: command_buffer_gles2: Add test command_buffer_gles2_test for command_buffer_gles2 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: dllimport,v3 Created 4 years, 10 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/gles2_conform_support/egl/test_support.cc ('k') | no next file » | 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 419 matching lines...) Expand 10 before | Expand all | Expand 10 after
430 'sources': [ 430 'sources': [
431 # Note: sources list duplicated in GN build. 431 # Note: sources list duplicated in GN build.
432 # TODO(hendrikw): Move egl out of gles2_conform_support. 432 # TODO(hendrikw): Move egl out of gles2_conform_support.
433 'gles2_conform_support/egl/config.cc', 433 'gles2_conform_support/egl/config.cc',
434 'gles2_conform_support/egl/config.h', 434 'gles2_conform_support/egl/config.h',
435 'gles2_conform_support/egl/display.cc', 435 'gles2_conform_support/egl/display.cc',
436 'gles2_conform_support/egl/display.h', 436 'gles2_conform_support/egl/display.h',
437 'gles2_conform_support/egl/egl.cc', 437 'gles2_conform_support/egl/egl.cc',
438 'gles2_conform_support/egl/surface.cc', 438 'gles2_conform_support/egl/surface.cc',
439 'gles2_conform_support/egl/surface.h', 439 'gles2_conform_support/egl/surface.h',
440 'gles2_conform_support/egl/test_support.cc',
441 'gles2_conform_support/egl/test_support.h',
442 ],
443 'defines': [
444 'COMMAND_BUFFER_GLES_LIB_SUPPORT_ONLY',
445 'EGLAPIENTRY=',
446 ],
447 'conditions': [
448 ['OS=="win"', {
449 'defines': [
450 'EGLAPI=__declspec(dllexport)',
Nico 2016/02/15 15:28:41 Isn't the usual spelling here __declspec(dllimport
451 ],
452 }, { # OS!="win"
453 'defines': [
Nico 2016/02/15 15:28:41 TABS
454 'EGLAPI=__attribute__((visibility(\"default\")))'
455 ],
456 }],
457 ],
458 },
459 {
460 # GN version: //gpu:command_buffer_gles2_tests
461 'target_name': 'command_buffer_gles2_tests',
462 'type': '<(gtest_target_type)',
463 'dependencies': [
464 '../base/base.gyp:base',
465 '../base/base.gyp:test_support_base',
466 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations',
467 '../testing/gmock.gyp:gmock',
468 '../testing/gtest.gyp:gtest',
469 'command_buffer_gles2',
470 ],
471 'sources': [
472 # Note: sources list duplicated in GN build.
473 'command_buffer/tests/command_buffer_gles2_tests_main.cc',
474 'command_buffer/tests/egl_test.cc',
475 ],
476 'defines': [
477 'COMMAND_BUFFER_GLES_LIB_SUPPORT_ONLY',
478 'EGLAPIENTRY=',
440 ], 479 ],
441 'conditions': [ 480 'conditions': [
442 ['OS=="win"', { 481 ['OS=="win"', {
443 'defines': [ 482 'defines': [
444 'COMMAND_BUFFER_GLES_LIB_SUPPORT_ONLY', 483 'EGLAPI=__declspec(dllimport)',
445 'EGLAPIENTRY=',
446 'EGLAPI=__declspec(dllexport)',
447 ], 484 ],
448 }, { # OS!="win" 485 }, { # OS!="win"
449 'defines': [ 486 » » 'defines': [
Nico 2016/02/15 15:28:41 MORE TABS
450 'COMMAND_BUFFER_GLES_LIB_SUPPORT_ONLY', 487 'EGLAPI=',
451 'EGLAPIENTRY=',
452 'EGLAPI=__attribute__((visibility(\"default\")))'
453 ], 488 ],
454 }, ], 489 » » }],
Nico 2016/02/15 15:28:41 AAAAAAH
490 ['OS == "android"', {
491 'dependencies': [
492 '../testing/android/native_test.gyp:native_test_native_code',
493 ],
494 }],
455 ], 495 ],
456 } 496 },
457 ], 497 ],
458 'conditions': [ 498 'conditions': [
459 ['component=="static_library"', { 499 ['component=="static_library"', {
460 'targets': [ 500 'targets': [
461 { 501 {
462 # GN version: //gpu/command_buffer/service:disk_cache_proto 502 # GN version: //gpu/command_buffer/service:disk_cache_proto
463 'target_name': 'disk_cache_proto', 503 'target_name': 'disk_cache_proto',
464 'type': 'static_library', 504 'type': 'static_library',
465 'sources': [ 'command_buffer/service/disk_cache_proto.proto' ], 505 'sources': [ 'command_buffer/service/disk_cache_proto.proto' ],
466 'variables': { 506 'variables': {
(...skipping 279 matching lines...) Expand 10 before | Expand all | Expand 10 after
746 'target_name': 'gpu_perftests_apk', 786 'target_name': 'gpu_perftests_apk',
747 'type': 'none', 787 'type': 'none',
748 'dependencies': [ 788 'dependencies': [
749 'gpu_perftests', 789 'gpu_perftests',
750 ], 790 ],
751 'variables': { 791 'variables': {
752 'test_suite_name': 'gpu_perftests', 792 'test_suite_name': 'gpu_perftests',
753 }, 793 },
754 'includes': [ '../build/apk_test.gypi' ], 794 'includes': [ '../build/apk_test.gypi' ],
755 }, 795 },
796 {
797 'target_name': 'command_buffer_gles2_tests_apk',
798 'type': 'none',
799 'dependencies': [
800 'command_buffer_gles2_tests',
801 ],
802 'variables': {
803 'test_suite_name': 'command_buffer_gles2_tests',
804 },
805 'includes': [
806 '../build/apk_test.gypi',
807 ],
808 },
756 ], 809 ],
757 }], 810 }],
758 ['OS == "win" or (OS == "linux" and use_x11==1) or OS == "mac"', { 811 ['OS == "win" or (OS == "linux" and use_x11==1) or OS == "mac"', {
759 'targets': [ 812 'targets': [
760 { 813 {
761 'target_name': 'angle_end2end_tests', 814 'target_name': 'angle_end2end_tests',
762 'type': '<(gtest_target_type)', 815 'type': '<(gtest_target_type)',
763 'dependencies': [ 816 'dependencies': [
764 '../base/base.gyp:base', 817 '../base/base.gyp:base',
765 '../base/base.gyp:test_support_base', 818 '../base/base.gyp:test_support_base',
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
873 'sources': [ 926 'sources': [
874 'angle_deqp_tests_main.cc', 927 'angle_deqp_tests_main.cc',
875 ], 928 ],
876 }, 929 },
877 ], 930 ],
878 }], 931 }],
879 ['OS == "android" and test_isolation_mode != "noop"', 932 ['OS == "android" and test_isolation_mode != "noop"',
880 { 933 {
881 'targets': [ 934 'targets': [
882 { 935 {
936 'target_name': 'command_buffer_gles2_tests_apk_run',
937 'type': 'none',
938 'dependencies': [
939 'command_buffer_gles2_tests_apk',
940 ],
941 'includes': [
942 '../build/isolate.gypi',
943 ],
944 'sources': [
945 'command_buffer_gles2_apk.isolate',
946 ],
947 },
948 {
883 'target_name': 'gl_tests_apk_run', 949 'target_name': 'gl_tests_apk_run',
884 'type': 'none', 950 'type': 'none',
885 'dependencies': [ 951 'dependencies': [
886 'gl_tests_apk', 952 'gl_tests_apk',
887 ], 953 ],
888 'includes': [ 954 'includes': [
889 '../build/isolate.gypi', 955 '../build/isolate.gypi',
890 ], 956 ],
891 'sources': [ 957 'sources': [
892 'gl_tests_apk.isolate', 958 'gl_tests_apk.isolate',
(...skipping 10 matching lines...) Expand all
903 ], 969 ],
904 'sources': [ 970 'sources': [
905 'gpu_unittests_apk.isolate', 971 'gpu_unittests_apk.isolate',
906 ], 972 ],
907 }, 973 },
908 ], 974 ],
909 }, 975 },
910 ], 976 ],
911 ], 977 ],
912 } 978 }
OLDNEW
« no previous file with comments | « gpu/gles2_conform_support/egl/test_support.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698