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("//mojo/public/mojo_application.gni") | 5 import("//mojo/public/mojo_application.gni") |
6 | 6 |
7 mojo_native_application("network") { | 7 if (is_android) { |
8 output_name = "network_service" | 8 import("//build/config/android/rules.gni") |
9 sources = [ | 9 |
10 "main.cc", | 10 java_library_path = "$target_out_dir/java_library.dex.jar" |
qsr
2014/12/05 15:31:16
Could you add a blank line between this and next l
ppi
2014/12/05 17:17:43
Done.
| |
11 ] | 11 mojo_android_application("network") { |
12 deps = [ | 12 output_name = "network_service" |
13 ":lib", | 13 input_so = "$root_out_dir/lib.stripped/libnetwork_service.so" |
14 "//base", | 14 input_dex_jar = java_library_path |
15 "//mojo/application", | 15 } |
16 "//mojo/public/cpp/bindings:bindings", | 16 |
17 "//mojo/services/public/cpp/network", | 17 shared_library("native_library") { |
18 "//mojo/services/public/interfaces/network", | 18 output_name = "network_service" |
19 ] | 19 |
20 deps = [ | |
21 ":sources", | |
22 ] | |
23 | |
24 sources = [ | |
qsr
2014/12/05 15:31:16
sources before deps -> https://code.google.com/p/c
ppi
2014/12/05 17:17:43
Done.
| |
25 "android_hooks.cc", | |
26 ] | |
27 } | |
28 | |
29 android_standalone_library("java_library") { | |
30 deps = [ | |
qsr
2014/12/05 15:31:16
Same thing, deps is the last thing there.
ppi
2014/12/05 17:17:43
Done.
| |
31 "//net/android:net_java", | |
32 ] | |
33 | |
34 standalone_dex_path = java_library_path | |
35 } | |
36 } else { | |
37 mojo_native_application("network") { | |
38 output_name = "network_service" | |
39 deps = [ | |
40 ":sources", | |
41 ] | |
42 } | |
20 } | 43 } |
21 | 44 |
22 source_set("lib") { | 45 source_set("lib") { |
23 sources = [ | 46 sources = [ |
24 "cookie_store_impl.cc", | 47 "cookie_store_impl.cc", |
25 "cookie_store_impl.h", | 48 "cookie_store_impl.h", |
26 "net_adapters.cc", | 49 "net_adapters.cc", |
27 "net_adapters.h", | 50 "net_adapters.h", |
28 "net_address_type_converters.cc", | 51 "net_address_type_converters.cc", |
29 "net_address_type_converters.h", | 52 "net_address_type_converters.h", |
(...skipping 21 matching lines...) Expand all Loading... | |
51 "//mojo/common", | 74 "//mojo/common", |
52 "//mojo/environment:chromium", | 75 "//mojo/environment:chromium", |
53 "//mojo/public/cpp/bindings", | 76 "//mojo/public/cpp/bindings", |
54 "//mojo/services/public/cpp/network", | 77 "//mojo/services/public/cpp/network", |
55 "//mojo/services/public/interfaces/network", | 78 "//mojo/services/public/interfaces/network", |
56 "//net", | 79 "//net", |
57 "//url", | 80 "//url", |
58 ] | 81 ] |
59 } | 82 } |
60 | 83 |
84 source_set("sources") { | |
85 visibility = [ ":*" ] | |
qsr
2014/12/05 15:31:16
Do you need to use this because gn will complain i
ppi
2014/12/05 17:17:43
ERROR at //mojo/public/mojo_application.gni:30:3:
qsr
2014/12/08 14:27:07
That doesn't feel right. There might be something
| |
86 | |
87 sources = [ | |
88 "main.cc", | |
89 ] | |
90 | |
91 deps = [ | |
92 ":lib", | |
93 "//base", | |
94 "//mojo/application", | |
95 "//mojo/public/c/system:for_shared_library", | |
96 "//mojo/public/cpp/bindings:bindings", | |
97 "//mojo/services/public/cpp/network", | |
98 "//mojo/services/public/interfaces/network", | |
99 ] | |
100 } | |
101 | |
61 mojo_native_application("apptests") { | 102 mojo_native_application("apptests") { |
62 output_name = "network_service_apptests" | 103 output_name = "network_service_apptests" |
63 testonly = true | 104 testonly = true |
64 | 105 |
65 sources = [ | 106 sources = [ |
66 "udp_socket_apptest.cc", | 107 "udp_socket_apptest.cc", |
67 ] | 108 ] |
68 | 109 |
69 deps = [ | 110 deps = [ |
70 ":network", | 111 ":network", |
71 "//base", | 112 "//base", |
72 "//mojo/application", | 113 "//mojo/application", |
73 "//mojo/application:test_support", | 114 "//mojo/application:test_support", |
74 "//mojo/public/cpp/bindings", | 115 "//mojo/public/cpp/bindings", |
75 "//mojo/public/cpp/bindings:callback", | 116 "//mojo/public/cpp/bindings:callback", |
76 "//mojo/services/public/cpp/network", | 117 "//mojo/services/public/cpp/network", |
77 "//mojo/services/public/interfaces/network", | 118 "//mojo/services/public/interfaces/network", |
78 "//net", | 119 "//net", |
79 "//testing/gtest", | 120 "//testing/gtest", |
80 ] | 121 ] |
81 } | 122 } |
OLD | NEW |