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

Side by Side Diff: net/BUILD.gn

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
« no previous file with comments | « mojo/util/capture_util.h ('k') | net/DEPS » ('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) 2013 The Chromium Authors. All rights reserved. 1 # Copyright (c) 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 import("//build/config/chromecast_build.gni") 5 import("//build/config/chromecast_build.gni")
6 import("//build/config/compiler/compiler.gni") 6 import("//build/config/compiler/compiler.gni")
7 import("//build/config/crypto.gni") 7 import("//build/config/crypto.gni")
8 import("//build/config/features.gni") 8 import("//build/config/features.gni")
9 import("//build/config/ui.gni") 9 import("//build/config/ui.gni")
10 import("//build_overrides/v8.gni") 10 import("//build_overrides/v8.gni")
(...skipping 766 matching lines...) Expand 10 before | Expand all | Expand 10 after
777 "proxy/proxy_resolver_factory_mojo.h", 777 "proxy/proxy_resolver_factory_mojo.h",
778 "proxy/proxy_service_mojo.cc", 778 "proxy/proxy_service_mojo.cc",
779 "proxy/proxy_service_mojo.h", 779 "proxy/proxy_service_mojo.h",
780 ] 780 ]
781 781
782 public_deps = [ 782 public_deps = [
783 ":mojo_type_converters", 783 ":mojo_type_converters",
784 ":net", 784 ":net",
785 "//base", 785 "//base",
786 "//mojo/common", 786 "//mojo/common",
787 "//mojo/public/cpp/bindings",
787 "//net/interfaces", 788 "//net/interfaces",
788 "//third_party/mojo/src/mojo/public/cpp/bindings",
789 789
790 # NOTE(amistry): As long as we support in-process Mojo v8 PAC, we need 790 # NOTE(amistry): As long as we support in-process Mojo v8 PAC, we need
791 # this dependency since in_process_mojo_proxy_resolver_factory creates 791 # this dependency since in_process_mojo_proxy_resolver_factory creates
792 # the utility process side Mojo services in the browser process. 792 # the utility process side Mojo services in the browser process.
793 # Ultimately, this will go away when we only support out-of-process. 793 # Ultimately, this will go away when we only support out-of-process.
794 ":net_utility_services", 794 ":net_utility_services",
795 ] 795 ]
796 } 796 }
797 797
798 source_set("mojo_type_converters") { 798 source_set("mojo_type_converters") {
799 sources = [ 799 sources = [
800 "dns/mojo_host_type_converters.cc", 800 "dns/mojo_host_type_converters.cc",
801 "dns/mojo_host_type_converters.h", 801 "dns/mojo_host_type_converters.h",
802 "proxy/mojo_proxy_type_converters.cc", 802 "proxy/mojo_proxy_type_converters.cc",
803 "proxy/mojo_proxy_type_converters.h", 803 "proxy/mojo_proxy_type_converters.h",
804 ] 804 ]
805 805
806 public_deps = [ 806 public_deps = [
807 ":net", 807 ":net",
808 "//mojo/public/cpp/bindings",
808 "//net/interfaces", 809 "//net/interfaces",
809 "//third_party/mojo/src/mojo/public/cpp/bindings",
810 ] 810 ]
811 } 811 }
812 812
813 source_set("net_utility_services") { 813 source_set("net_utility_services") {
814 sources = [ 814 sources = [
815 "dns/host_resolver_mojo.cc", 815 "dns/host_resolver_mojo.cc",
816 "dns/host_resolver_mojo.h", 816 "dns/host_resolver_mojo.h",
817 "proxy/mojo_proxy_resolver_factory_impl.cc", 817 "proxy/mojo_proxy_resolver_factory_impl.cc",
818 "proxy/mojo_proxy_resolver_factory_impl.h", 818 "proxy/mojo_proxy_resolver_factory_impl.h",
819 "proxy/mojo_proxy_resolver_impl.cc", 819 "proxy/mojo_proxy_resolver_impl.cc",
820 "proxy/mojo_proxy_resolver_impl.h", 820 "proxy/mojo_proxy_resolver_impl.h",
821 "proxy/mojo_proxy_resolver_v8_tracing_bindings.h", 821 "proxy/mojo_proxy_resolver_v8_tracing_bindings.h",
822 ] 822 ]
823 823
824 deps = [ 824 deps = [
825 ":net_with_v8", 825 ":net_with_v8",
826 ] 826 ]
827 827
828 public_deps = [ 828 public_deps = [
829 ":mojo_type_converters", 829 ":mojo_type_converters",
830 ":net", 830 ":net",
831 "//mojo/common", 831 "//mojo/common",
832 "//mojo/public/cpp/bindings",
832 "//net/interfaces", 833 "//net/interfaces",
833 "//third_party/mojo/src/mojo/public/cpp/bindings",
834 ] 834 ]
835 } 835 }
836 } 836 }
837 837
838 if (!is_ios && !is_android) { 838 if (!is_ios && !is_android) {
839 executable("crash_cache") { 839 executable("crash_cache") {
840 testonly = true 840 testonly = true
841 sources = [ 841 sources = [
842 "tools/crash_cache/crash_cache.cc", 842 "tools/crash_cache/crash_cache.cc",
843 ] 843 ]
(...skipping 817 matching lines...) Expand 10 before | Expand all | Expand 10 after
1661 if (enable_websockets) { 1661 if (enable_websockets) {
1662 sources += [ "websockets/websocket_frame_perftest.cc" ] 1662 sources += [ "websockets/websocket_frame_perftest.cc" ]
1663 } 1663 }
1664 1664
1665 if (use_v8_in_net) { 1665 if (use_v8_in_net) {
1666 deps += [ ":net_with_v8" ] 1666 deps += [ ":net_with_v8" ]
1667 } else { 1667 } else {
1668 sources -= [ "proxy/proxy_resolver_perftest.cc" ] 1668 sources -= [ "proxy/proxy_resolver_perftest.cc" ]
1669 } 1669 }
1670 } 1670 }
OLDNEW
« no previous file with comments | « mojo/util/capture_util.h ('k') | net/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698