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

Side by Side Diff: gpu/gpu.gyp

Issue 1714903003: mustash: Move gpu/ipc to gpu/ipc/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix Win64 build Created 4 years, 9 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/common/mojo.typemap ('k') | gpu/gpu_ipc.gypi » ('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 'build_angle_deqp_tests%': 0, 8 'build_angle_deqp_tests%': 0,
9 }, 9 },
10 'includes': [ 10 'includes': [
(...skipping 505 matching lines...) Expand 10 before | Expand all | Expand 10 after
516 { 516 {
517 # GN version: //gpu 517 # GN version: //gpu
518 'target_name': 'gpu', 518 'target_name': 'gpu',
519 'type': 'none', 519 'type': 'none',
520 'dependencies': [ 520 'dependencies': [
521 'command_buffer_client', 521 'command_buffer_client',
522 'command_buffer_common', 522 'command_buffer_common',
523 'command_buffer_service', 523 'command_buffer_service',
524 'gles2_cmd_helper', 524 'gles2_cmd_helper',
525 'gpu_config', 525 'gpu_config',
526 'gpu_ipc',
527 'gpu_ipc_common', 526 'gpu_ipc_common',
528 ], 527 ],
529 'sources': [ 528 'sources': [
530 'gpu_export.h', 529 'gpu_export.h',
531 ], 530 ],
532 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 531 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
533 'msvs_disabled_warnings': [4267, ], 532 'msvs_disabled_warnings': [4267, ],
534 }, 533 },
535 { 534 {
536 # GN version: //gpu/command_buffer/common 535 # GN version: //gpu/command_buffer/common
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
587 ], 586 ],
588 'dependencies': [ 587 'dependencies': [
589 'command_buffer_common', 588 'command_buffer_common',
590 'disk_cache_proto', 589 'disk_cache_proto',
591 'gpu_config', 590 'gpu_config',
592 ], 591 ],
593 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 592 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
594 'msvs_disabled_warnings': [4267, ], 593 'msvs_disabled_warnings': [4267, ],
595 }, 594 },
596 { 595 {
597 # GN version: //gpu/ipc
598 'target_name': 'gpu_ipc',
599 'type': 'static_library',
600 'includes': [
601 'gpu_ipc.gypi',
602 ],
603 'dependencies': [
604 'command_buffer_common',
605 ],
606 },
607 {
608 # GN version: //gpu/ipc/common 596 # GN version: //gpu/ipc/common
609 'target_name': 'gpu_ipc_common', 597 'target_name': 'gpu_ipc_common',
610 'type': 'static_library', 598 'type': 'static_library',
611 'includes': [ 599 'includes': [
612 'gpu_ipc_common.gypi', 600 'gpu_ipc_common.gypi',
613 ], 601 ],
614 }, 602 },
615 { 603 {
616 'target_name': 'gpu_config', 604 'target_name': 'gpu_config',
617 'type': 'static_library', 605 'type': 'static_library',
(...skipping 19 matching lines...) Expand all
637 { 625 {
638 # GN version: //gpu 626 # GN version: //gpu
639 'target_name': 'gpu', 627 'target_name': 'gpu',
640 'type': 'shared_library', 628 'type': 'shared_library',
641 'includes': [ 629 'includes': [
642 'command_buffer_client.gypi', 630 'command_buffer_client.gypi',
643 'command_buffer_common.gypi', 631 'command_buffer_common.gypi',
644 'command_buffer_service.gypi', 632 'command_buffer_service.gypi',
645 'gles2_cmd_helper.gypi', 633 'gles2_cmd_helper.gypi',
646 'gpu_config.gypi', 634 'gpu_config.gypi',
647 'gpu_ipc.gypi',
648 'gpu_ipc_common.gypi', 635 'gpu_ipc_common.gypi',
649 '../build/android/increase_size_for_speed.gypi', 636 '../build/android/increase_size_for_speed.gypi',
650 ], 637 ],
651 'defines': [ 638 'defines': [
652 'GPU_IMPLEMENTATION', 639 'GPU_IMPLEMENTATION',
653 ], 640 ],
654 'sources': [ 641 'sources': [
655 'gpu_export.h', 642 'gpu_export.h',
656 ], 643 ],
657 'dependencies': [ 644 'dependencies': [
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
691 }, 678 },
692 { 679 {
693 # GN version: //gpu/command_buffer/service 680 # GN version: //gpu/command_buffer/service
694 'target_name': 'command_buffer_service', 681 'target_name': 'command_buffer_service',
695 'type': 'none', 682 'type': 'none',
696 'dependencies': [ 683 'dependencies': [
697 'gpu', 684 'gpu',
698 ], 685 ],
699 }, 686 },
700 { 687 {
701 # GN version: //gpu/ipc
702 'target_name': 'gpu_ipc',
703 'type': 'none',
704 'dependencies': [
705 'gpu',
706 ],
707 },
708 {
709 # GN version: //gpu/ipc/common 688 # GN version: //gpu/ipc/common
710 'target_name': 'gpu_ipc_common', 689 'target_name': 'gpu_ipc_common',
711 'type': 'none', 690 'type': 'none',
712 'dependencies': [ 691 'dependencies': [
713 'gpu', 692 'gpu',
714 ], 693 ],
715 }, 694 },
716 ], 695 ],
717 }], 696 }],
718 ['disable_nacl!=1 and OS=="win" and target_arch=="ia32"', { 697 ['disable_nacl!=1 and OS=="win" and target_arch=="ia32"', {
(...skipping 14 matching lines...) Expand all
733 '<@(nacl_win64_defines)', 712 '<@(nacl_win64_defines)',
734 'GPU_IMPLEMENTATION', 713 'GPU_IMPLEMENTATION',
735 ], 714 ],
736 'configurations': { 715 'configurations': {
737 'Common_Base': { 716 'Common_Base': {
738 'msvs_target_platform': 'x64', 717 'msvs_target_platform': 'x64',
739 }, 718 },
740 }, 719 },
741 }, 720 },
742 { 721 {
743 'target_name': 'gpu_ipc_win64',
744 'type': 'static_library',
745 'variables': {
746 'nacl_win64_target': 1,
747 },
748 'includes': [
749 'gpu_ipc.gypi',
750 ],
751 'dependencies': [
752 '../base/base.gyp:base_win64',
753 '../ipc/ipc.gyp:ipc_win64',
754 'command_buffer_common_win64',
755 ],
756 'defines': [
757 '<@(nacl_win64_defines)',
758 'GPU_IMPLEMENTATION',
759 ],
760 'configurations': {
761 'Common_Base': {
762 'msvs_target_platform': 'x64',
763 },
764 },
765 },
766 {
767 'target_name': 'gpu_ipc_common_win64', 722 'target_name': 'gpu_ipc_common_win64',
768 'type': 'static_library', 723 'type': 'static_library',
769 'variables': { 724 'variables': {
770 'nacl_win64_target': 1, 725 'nacl_win64_target': 1,
771 }, 726 },
772 'includes': [ 727 'includes': [
773 'gpu_ipc_common.gypi', 728 'gpu_ipc_common.gypi',
774 ], 729 ],
775 'dependencies': [ 730 'dependencies': [
776 '../base/base.gyp:base_win64', 731 '../base/base.gyp:base_win64',
(...skipping 238 matching lines...) Expand 10 before | Expand all | Expand 10 after
1015 ], 970 ],
1016 'sources': [ 971 'sources': [
1017 'gpu_unittests_apk.isolate', 972 'gpu_unittests_apk.isolate',
1018 ], 973 ],
1019 }, 974 },
1020 ], 975 ],
1021 }, 976 },
1022 ], 977 ],
1023 ], 978 ],
1024 } 979 }
OLDNEW
« no previous file with comments | « gpu/command_buffer/common/mojo.typemap ('k') | gpu/gpu_ipc.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698