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

Side by Side Diff: net/net.gyp

Issue 1410053006: Move third_party/mojo/src/mojo/public to mojo/public (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge Created 5 years, 1 month 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
OLDNEW
1 # Copyright 2013 The Chromium Authors. All rights reserved. 1 # Copyright 2013 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 'chromium_code': 1, 7 'chromium_code': 1,
8 'linux_link_kerberos%': 0, 8 'linux_link_kerberos%': 0,
9 'conditions': [ 9 'conditions': [
10 ['chromeos==1 or embedded==1 or OS=="ios"', { 10 ['chromeos==1 or embedded==1 or OS=="ios"', {
(...skipping 873 matching lines...) Expand 10 before | Expand all | Expand 10 after
884 'targets': [ 884 'targets': [
885 { 885 {
886 # GN version: //net/interfaces 886 # GN version: //net/interfaces
887 'target_name': 'net_interfaces', 887 'target_name': 'net_interfaces',
888 'type': 'static_library', 888 'type': 'static_library',
889 'sources': [ 889 'sources': [
890 'interfaces/host_resolver_service.mojom', 890 'interfaces/host_resolver_service.mojom',
891 'interfaces/proxy_resolver_service.mojom', 891 'interfaces/proxy_resolver_service.mojom',
892 ], 892 ],
893 'includes': [ 893 'includes': [
894 '../third_party/mojo/mojom_bindings_generator.gypi', 894 '../mojo/mojom_bindings_generator.gypi',
895 ], 895 ],
896 }, 896 },
897 { 897 {
898 # GN version: //net:net_browser_services 898 # GN version: //net:net_browser_services
899 'target_name': 'net_browser_services', 899 'target_name': 'net_browser_services',
900 'type': 'static_library', 900 'type': 'static_library',
901 'sources': [ 901 'sources': [
902 'dns/mojo_host_resolver_impl.cc', 902 'dns/mojo_host_resolver_impl.cc',
903 'dns/mojo_host_resolver_impl.h', 903 'dns/mojo_host_resolver_impl.h',
904 'proxy/in_process_mojo_proxy_resolver_factory.cc', 904 'proxy/in_process_mojo_proxy_resolver_factory.cc',
905 'proxy/in_process_mojo_proxy_resolver_factory.h', 905 'proxy/in_process_mojo_proxy_resolver_factory.h',
906 'proxy/mojo_proxy_resolver_factory.h', 906 'proxy/mojo_proxy_resolver_factory.h',
907 'proxy/proxy_resolver_factory_mojo.cc', 907 'proxy/proxy_resolver_factory_mojo.cc',
908 'proxy/proxy_resolver_factory_mojo.h', 908 'proxy/proxy_resolver_factory_mojo.h',
909 'proxy/proxy_service_mojo.cc', 909 'proxy/proxy_service_mojo.cc',
910 'proxy/proxy_service_mojo.h', 910 'proxy/proxy_service_mojo.h',
911 ], 911 ],
912 'dependencies': [ 912 'dependencies': [
913 'mojo_type_converters', 913 'mojo_type_converters',
914 'net', 914 'net',
915 'net_interfaces', 915 'net_interfaces',
916 '../mojo/mojo_base.gyp:mojo_common_lib', 916 '../mojo/mojo_base.gyp:mojo_common_lib',
917 '../mojo/mojo_base.gyp:mojo_environment_chromium', 917 '../mojo/mojo_base.gyp:mojo_environment_chromium',
918 '../mojo/mojo_base.gyp:mojo_url_type_converters', 918 '../mojo/mojo_base.gyp:mojo_url_type_converters',
919 '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings', 919 '../mojo/mojo_public.gyp:mojo_cpp_bindings',
920 920
921 # NOTE(amistry): As long as we support in-process Mojo v8 PAC, we 921 # NOTE(amistry): As long as we support in-process Mojo v8 PAC, we
922 # need this dependency since in_process_mojo_proxy_resolver_factory 922 # need this dependency since in_process_mojo_proxy_resolver_factory
923 # creates the utility process side Mojo services in the browser 923 # creates the utility process side Mojo services in the browser
924 # process. Ultimately, this will go away when we only support 924 # process. Ultimately, this will go away when we only support
925 # out-of-process. 925 # out-of-process.
926 'net_utility_services', 926 'net_utility_services',
927 ], 927 ],
928 }, 928 },
929 { 929 {
930 # GN version: //net:net_utility_services 930 # GN version: //net:net_utility_services
931 'target_name': 'net_utility_services', 931 'target_name': 'net_utility_services',
932 'type': 'static_library', 932 'type': 'static_library',
933 'sources': [ 933 'sources': [
934 'dns/host_resolver_mojo.cc', 934 'dns/host_resolver_mojo.cc',
935 'dns/host_resolver_mojo.h', 935 'dns/host_resolver_mojo.h',
936 'proxy/mojo_proxy_resolver_factory_impl.cc', 936 'proxy/mojo_proxy_resolver_factory_impl.cc',
937 'proxy/mojo_proxy_resolver_factory_impl.h', 937 'proxy/mojo_proxy_resolver_factory_impl.h',
938 'proxy/mojo_proxy_resolver_impl.cc', 938 'proxy/mojo_proxy_resolver_impl.cc',
939 'proxy/mojo_proxy_resolver_impl.h', 939 'proxy/mojo_proxy_resolver_impl.h',
940 'proxy/mojo_proxy_resolver_v8_tracing_bindings.h', 940 'proxy/mojo_proxy_resolver_v8_tracing_bindings.h',
941 ], 941 ],
942 'dependencies': [ 942 'dependencies': [
943 'mojo_type_converters', 943 'mojo_type_converters',
944 'net_interfaces', 944 'net_interfaces',
945 'net_with_v8', 945 'net_with_v8',
946 '../mojo/mojo_base.gyp:mojo_url_type_converters', 946 '../mojo/mojo_base.gyp:mojo_url_type_converters',
947 '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings', 947 '../mojo/mojo_public.gyp:mojo_cpp_bindings',
948 ], 948 ],
949 }, 949 },
950 { 950 {
951 # GN version: //net:mojo_type_converters 951 # GN version: //net:mojo_type_converters
952 'target_name': 'mojo_type_converters', 952 'target_name': 'mojo_type_converters',
953 'type': 'static_library', 953 'type': 'static_library',
954 'sources': [ 954 'sources': [
955 'dns/mojo_host_type_converters.cc', 955 'dns/mojo_host_type_converters.cc',
956 'dns/mojo_host_type_converters.h', 956 'dns/mojo_host_type_converters.h',
957 'proxy/mojo_proxy_type_converters.cc', 957 'proxy/mojo_proxy_type_converters.cc',
958 'proxy/mojo_proxy_type_converters.h', 958 'proxy/mojo_proxy_type_converters.h',
959 ], 959 ],
960 'dependencies': [ 960 'dependencies': [
961 'net', 961 'net',
962 'net_interfaces', 962 'net_interfaces',
963 '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings', 963 '../mojo/mojo_public.gyp:mojo_cpp_bindings',
964 ], 964 ],
965 }, 965 },
966 ], 966 ],
967 }], 967 }],
968 ['OS != "ios" and OS != "android"', { 968 ['OS != "ios" and OS != "android"', {
969 'targets': [ 969 'targets': [
970 # iOS doesn't have the concept of simple executables, these targets 970 # iOS doesn't have the concept of simple executables, these targets
971 # can't be compiled on the platform. 971 # can't be compiled on the platform.
972 { 972 {
973 'target_name': 'crash_cache', 973 'target_name': 'crash_cache',
(...skipping 657 matching lines...) Expand 10 before | Expand all | Expand 10 after
1631 '../build/isolate.gypi', 1631 '../build/isolate.gypi',
1632 ], 1632 ],
1633 'sources': [ 1633 'sources': [
1634 'net_unittests.isolate', 1634 'net_unittests.isolate',
1635 ], 1635 ],
1636 }, 1636 },
1637 ], 1637 ],
1638 }], 1638 }],
1639 ], 1639 ],
1640 } 1640 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698