Gets packaging of html_viewer for android working

mojo/services/html_viewer/BUILD.gn

Index: mojo/services/html_viewer/BUILD.gn
diff --git a/mojo/services/html_viewer/BUILD.gn b/mojo/services/html_viewer/BUILD.gn
index 4a8d4091ef3035ca133195e5d3fd2c4a77866d1e..40186b9c285ad0036548bf8c3fc075f60cb6eb70 100644
--- a/mojo/services/html_viewer/BUILD.gn
+++ b/mojo/services/html_viewer/BUILD.gn
@@ -110,13 +110,71 @@ source_set("lib") {
   ]
 }
 
-mojo_native_application("html_viewer") {
-  sources = [
-    "html_viewer.cc",
-  ]
-  deps = [
-    ":lib",
-  ]
+if (is_android) {
+  import("//build/config/android/rules.gni")
+
+  java_library_path = "$target_out_dir/java_library.dex.jar"
+
+  mojo_android_application("html_viewer") {
+    input_so = "$root_out_dir/lib.stripped/libhtml_viewer_lib.so"
+    input_dex_jar = java_library_path
+  }
+
+  shared_library("html_viewer_lib") {
+    sources = [
+      "android/android_hooks.cc",
+      "html_viewer.cc",
+    ]
+
+    deps = [
+      ":html_viewer_jni_headers",
+      ":lib",
+      "//base",
+      "//ui/gfx:gfx_jni_headers",
+    ]
+  }
+
+  generate_jni("html_viewer_jni_headers") {
+    sources = [
+      "android/java/org/chromium/html_viewer/Main.java",
+    ]
+    jni_package = "mojo/services/html_viewer"
+  }
+
+  android_library("html_viewer_java_classes") {
+    java_files = [ "android/java/org/chromium/html_viewer/Main.java" ]
+
+    deps = [
+      "//base:base_java",
+    ]
+  }
+
+  android_library("html_viewer_gfx_classes") {

[qsr, 2015/03/13 16:53:12]

That's really, really, really weird. Why isn't this defined in //ui ? Compiling
some code from another component is not really supposed to happen.

[sky, 2015/03/13 17:35:48]

I'm not sure what ends up using that file in a real build. The only place it's
declared is here:
https://code.google.com/p/chromium/codesearch#chromium/src/ui/gfx/BUILD.gn&q=...
. But maybe I'm misunderstanding what gfx_jni_headers ends up doing. I'll play
with it shortly and see if I can figure this out.

+    java_files =
+        [ "//ui/android/java/src/org/chromium/ui/gfx/DeviceDisplayInfo.java" ]
+
+    deps = [
+      "//base:base_java",
+    ]
+  }
+
+  android_standalone_library("java_library") {
+    dex_path = java_library_path
+
+    deps = [
+      ":html_viewer_gfx_classes",
+      ":html_viewer_java_classes",
+    ]
+  }
+} else {
+  mojo_native_application("html_viewer") {
+    sources = [
+      "html_viewer.cc",
+    ]
+    deps = [
+      ":lib",
+    ]
+  }
 }
 
 test("tests") {