| OLD | NEW | 
|---|
| 1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 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("//third_party/mojo/src/mojo/public/mojo_application.gni") | 5 import("../mojo_sdk_root.gni") | 
|  | 6 import("$mojo_sdk_root/mojo/public/mojo_application.gni") | 
| 6 | 7 | 
| 7 mojo_native_application("network") { | 8 if (is_android) { | 
| 8   output_name = "network_service" | 9   import("//build/config/android/rules.gni") | 
| 9 | 10 | 
| 10   deps = [ | 11   java_library_path = "$target_out_dir/java_library.dex.jar" | 
| 11     ":lib", |  | 
| 12     "//base", |  | 
| 13     "//mojo/application", |  | 
| 14     "//mojo/services/network/public/interfaces", |  | 
| 15     "//third_party/mojo/src/mojo/public/c/system:for_shared_library", |  | 
| 16     "//third_party/mojo/src/mojo/public/cpp/bindings:bindings", |  | 
| 17   ] |  | 
| 18 | 12 | 
| 19   sources = [ | 13   mojo_android_application("network") { | 
| 20     "network_service.cc", | 14     output_name = "network_service" | 
| 21   ] | 15     input_so = "$root_out_dir/lib.stripped/libnetwork_service.so" | 
|  | 16     input_dex_jar = java_library_path | 
|  | 17   } | 
|  | 18 | 
|  | 19   shared_library("native_library") { | 
|  | 20     output_name = "network_service" | 
|  | 21 | 
|  | 22     sources = [ | 
|  | 23       "android_hooks.cc", | 
|  | 24     ] | 
|  | 25 | 
|  | 26     deps = [ | 
|  | 27       ":sources", | 
|  | 28       "//base", | 
|  | 29       "//net", | 
|  | 30     ] | 
|  | 31   } | 
|  | 32 | 
|  | 33   android_standalone_library("java_library") { | 
|  | 34     dex_path = java_library_path | 
|  | 35 | 
|  | 36     deps = [ | 
|  | 37       "//net/android:net_java", | 
|  | 38     ] | 
|  | 39   } | 
|  | 40 } else { | 
|  | 41   mojo_native_application("network") { | 
|  | 42     output_name = "network_service" | 
|  | 43 | 
|  | 44     deps = [ | 
|  | 45       ":sources", | 
|  | 46     ] | 
|  | 47   } | 
| 22 } | 48 } | 
| 23 | 49 | 
| 24 source_set("lib") { | 50 source_set("lib") { | 
| 25   deps = [ |  | 
| 26     "//base", |  | 
| 27     "//mojo/application", |  | 
| 28     "//mojo/common", |  | 
| 29     "//mojo/environment:chromium", |  | 
| 30     "//mojo/services/network/public/cpp", |  | 
| 31     "//mojo/services/network/public/interfaces", |  | 
| 32     "//net", |  | 
| 33     "//url", |  | 
| 34   ] |  | 
| 35 |  | 
| 36   sources = [ | 51   sources = [ | 
| 37     "cookie_store_impl.cc", | 52     "cookie_store_impl.cc", | 
| 38     "cookie_store_impl.h", | 53     "cookie_store_impl.h", | 
| 39     "net_adapters.cc", | 54     "net_adapters.cc", | 
| 40     "net_adapters.h", | 55     "net_adapters.h", | 
| 41     "net_address_type_converters.cc", | 56     "net_address_type_converters.cc", | 
| 42     "net_address_type_converters.h", | 57     "net_address_type_converters.h", | 
| 43     "network_context.cc", | 58     "network_context.cc", | 
| 44     "network_context.h", | 59     "network_context.h", | 
| 45     "network_service_impl.cc", | 60     "network_service_impl.cc", | 
| 46     "network_service_impl.h", | 61     "network_service_impl.h", | 
| 47     "tcp_bound_socket_impl.cc", | 62     "tcp_bound_socket_impl.cc", | 
| 48     "tcp_bound_socket_impl.h", | 63     "tcp_bound_socket_impl.h", | 
| 49     "tcp_connected_socket_impl.cc", | 64     "tcp_connected_socket_impl.cc", | 
| 50     "tcp_connected_socket_impl.h", | 65     "tcp_connected_socket_impl.h", | 
| 51     "tcp_server_socket_impl.cc", | 66     "tcp_server_socket_impl.cc", | 
| 52     "tcp_server_socket_impl.h", | 67     "tcp_server_socket_impl.h", | 
| 53     "udp_socket_impl.cc", | 68     "udp_socket_impl.cc", | 
| 54     "udp_socket_impl.h", | 69     "udp_socket_impl.h", | 
| 55     "url_loader_impl.cc", | 70     "url_loader_impl.cc", | 
| 56     "url_loader_impl.h", | 71     "url_loader_impl.h", | 
| 57     "web_socket_impl.cc", | 72     "web_socket_impl.cc", | 
| 58     "web_socket_impl.h", | 73     "web_socket_impl.h", | 
| 59   ] | 74   ] | 
|  | 75 | 
|  | 76   deps = [ | 
|  | 77     "$mojo_sdk_root/mojo/public/cpp/bindings", | 
|  | 78     "//base", | 
|  | 79     "//mojo/application", | 
|  | 80     "//mojo/common", | 
|  | 81     "//mojo/environment:chromium", | 
|  | 82     "//mojo/services/network/public/cpp", | 
|  | 83     "//mojo/services/network/public/interfaces", | 
|  | 84     "//net", | 
|  | 85     "//url", | 
|  | 86   ] | 
| 60 } | 87 } | 
|  | 88 | 
|  | 89 source_set("sources") { | 
|  | 90   visibility = [ ":*" ] | 
|  | 91 | 
|  | 92   sources = [ | 
|  | 93     "network_service.cc", | 
|  | 94   ] | 
|  | 95 | 
|  | 96   deps = [ | 
|  | 97     ":lib", | 
|  | 98     "$mojo_sdk_root/mojo/public/c/system:for_shared_library", | 
|  | 99     "$mojo_sdk_root/mojo/public/cpp/bindings:bindings", | 
|  | 100     "//base", | 
|  | 101     "//mojo/application", | 
|  | 102     "//mojo/services/network/public/cpp", | 
|  | 103     "//mojo/services/network/public/interfaces", | 
|  | 104   ] | 
|  | 105 } | 
|  | 106 | 
|  | 107 mojo_native_application("apptests") { | 
|  | 108   output_name = "network_service_apptests" | 
|  | 109   testonly = true | 
|  | 110 | 
|  | 111   sources = [ | 
|  | 112     "udp_socket_apptest.cc", | 
|  | 113     "url_loader_impl_apptest.cc", | 
|  | 114   ] | 
|  | 115 | 
|  | 116   deps = [ | 
|  | 117     ":lib", | 
|  | 118     ":network", | 
|  | 119     "$mojo_sdk_root/mojo/public/cpp/bindings", | 
|  | 120     "$mojo_sdk_root/mojo/public/cpp/bindings:callback", | 
|  | 121     "//base", | 
|  | 122     "//mojo/application", | 
|  | 123     "//mojo/application:test_support", | 
|  | 124     "//mojo/common", | 
|  | 125     "//mojo/services/network/public/cpp", | 
|  | 126     "//mojo/services/network/public/interfaces", | 
|  | 127     "//net", | 
|  | 128     "//net:test_support", | 
|  | 129     "//testing/gtest", | 
|  | 130   ] | 
|  | 131 } | 
| OLD | NEW | 
|---|