Build standalone network service on Android.

mojo/services/network/BUILD.gn

Index: mojo/services/network/BUILD.gn
diff --git a/mojo/services/network/BUILD.gn b/mojo/services/network/BUILD.gn
index 0e55291152912de68b96adcf6882c02ff98060ea..74a3bddefd4e0f3ed3b1135c366f9227b54760f1 100644
--- a/mojo/services/network/BUILD.gn
+++ b/mojo/services/network/BUILD.gn
@@ -4,19 +4,47 @@
 
 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"
+
+    deps = [
+      ":common_deps",
+      "//mojo/public/c/system:for_shared_library"

[qsr, 2014/12/05 13:43:42]

Why is this dep needed here? I would expect that it is either needed by the
linux network service, or not at all.

[ppi, 2014/12/05 14:49:54]

It *is* needed by both linux and android, it's just that mojo_native_application
now adds it implicitly.

+    ]
+
+    sources = [
+      "android_hooks.cc",
+      "main.cc",
+    ]
+  }
+
+  android_standalone_library("java_library") {
+    deps = [
+      "//net/android:net_java",
+    ]
+
+    standalone_dex_path = java_library_path
+  }
+} else {
+  mojo_native_application("network") {
+    output_name = "network_service"
+    sources = [
+      "main.cc",
+    ]
+    deps = [
+      ":common_deps",
+    ]
+  }
 }
 
 source_set("lib") {
@@ -58,6 +86,18 @@ source_set("lib") {
   ]
 }
 
+# shared_library dependencies for both native and Android network_service.mojo.
+group("common_deps") {

[qsr, 2014/12/05 13:43:42]

Could you use source_set instead and put main.cc there.

Also you might want to rename this network_service_sources instead of
common_deps.

[ppi, 2014/12/05 14:49:54]

Done. Once we drop the shell dependency on :lib, we can probably join :lib and
:sources into one source set.

+  deps = [
+    ":lib",
+    "//base",
+    "//mojo/application",
+    "//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