Index: mojo/services/network/BUILD.gn |
diff --git a/mojo/services/network/BUILD.gn b/mojo/services/network/BUILD.gn |
index 0e55291152912de68b96adcf6882c02ff98060ea..3fc343132f53415074fa0390e7b607f1a0510f92 100644 |
--- a/mojo/services/network/BUILD.gn |
+++ b/mojo/services/network/BUILD.gn |
@@ -4,19 +4,44 @@ |
import("//mojo/public/mojo_application.gni") |
-mojo_native_application("network") { |
- output_name = "network_service" |
- sources = [ |
- "main.cc", |
- ] |
- deps = [ |
- ":lib", |
- "//base", |
- "//mojo/application", |
- "//mojo/public/cpp/bindings:bindings", |
- "//mojo/services/public/cpp/network", |
- "//mojo/services/public/interfaces/network", |
- ] |
+if (is_android) { |
+ import("//build/config/android/rules.gni") |
+ |
+ java_library_path = "$target_out_dir/java_library.dex.jar" |
+ |
+ mojo_android_application("network") { |
+ output_name = "network_service" |
+ input_so = "$root_out_dir/lib.stripped/libnetwork_service.so" |
+ input_dex_jar = java_library_path |
+ } |
+ |
+ shared_library("native_library") { |
+ output_name = "network_service" |
+ |
+ sources = [ |
+ "android_hooks.cc", |
+ ] |
+ |
+ deps = [ |
+ ":sources", |
+ ] |
+ } |
+ |
+ android_standalone_library("java_library") { |
+ dex_path = java_library_path |
+ |
+ deps = [ |
+ "//net/android:net_java", |
+ ] |
+ } |
+} else { |
+ mojo_native_application("network") { |
+ output_name = "network_service" |
+ |
+ deps = [ |
+ ":sources", |
+ ] |
+ } |
} |
source_set("lib") { |
@@ -58,6 +83,24 @@ source_set("lib") { |
] |
} |
+source_set("sources") { |
+ visibility = [ ":*" ] |
+ |
+ sources = [ |
+ "main.cc", |
+ ] |
+ |
+ deps = [ |
+ ":lib", |
+ "//base", |
+ "//mojo/application", |
+ "//mojo/public/c/system:for_shared_library", |
+ "//mojo/public/cpp/bindings:bindings", |
+ "//mojo/services/public/cpp/network", |
+ "//mojo/services/public/interfaces/network", |
+ ] |
+} |
+ |
mojo_native_application("apptests") { |
output_name = "network_service_apptests" |
testonly = true |