Gets mandoline working on android

components/html_viewer/BUILD.gn

Index: components/html_viewer/BUILD.gn
diff --git a/components/html_viewer/BUILD.gn b/components/html_viewer/BUILD.gn
index 79c6a6c1100dba460a55b00904c5657e4dfc03cc..e891d8607d4dbb43eb42a2d97dbc57359b61d74b 100644
--- a/components/html_viewer/BUILD.gn
+++ b/components/html_viewer/BUILD.gn
@@ -2,6 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+import("//build/module_args/v8.gni")
 import("//mojo/mojo_application_package.gni")
 import("//testing/test.gni")
 import("//third_party/mojo/src/mojo/public/mojo.gni")
@@ -155,71 +156,36 @@ source_set("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",
-      "ui_setup.h",
-      "ui_setup_android.cc",
-      "ui_setup_android.h",
-    ]
-
-    deps = [
-      ":html_viewer_jni_headers",
-      ":lib",
-      "//base",
-      "//ui/gfx:gfx_jni_headers",
-    ]
-
-    data_deps = [ "//mojo/services/network:network" ]
-  }
-
-  generate_jni("html_viewer_jni_headers") {
-    sources = [
-      "android/java/org/chromium/html_viewer/Main.java",
-    ]
-    jni_package = "components/html_viewer"
-  }
-
-  android_library("html_viewer_java_classes") {
-    java_files = [ "android/java/org/chromium/html_viewer/Main.java" ]
-
-    deps = [
-      "//base:base_java",
-    ]
-  }
-
-  android_standalone_library("java_library") {
-    dex_path = java_library_path
-
-    deps = [
-      ":html_viewer_java_classes",
+mojo_application_package("html_viewer") {
+  sources = [
+    "html_viewer.cc",
+    "ui_setup.h",
+    "ui_setup_android.cc",
+    "ui_setup_android.h",
+  ]
+  deps = [
+    ":lib",
+    "//components/resource_provider/public/cpp",
+    "//components/resource_provider/public/interfaces",
+    "//mojo/common",
+    "//mojo/platform_handle",
+    "//third_party/icu:icudata",
+    "//ui/resources:ui_test_pak",
+  ]
+  data_deps = [
+    "//mojo/services/network:network",
+    "//components/resource_provider",
+  ]
+  resources = [
+    "$root_out_dir/icudtl.dat",
+    "$root_out_dir/ui_test.pak",

[Ben Goodger (Google), 2015/05/11 21:26:22]

this seems weird... I know you're just pulling this forward but I'm noticing it
for the first time. Can you add a TODO to not depend on a test resource file
from production code?

[sky, 2015/05/11 21:34:21]

Done.

+  ]
 
-      # TODO(sky): this is WAY more than we need. We really only need
-      # DeviceDisplayInfo. Refactor to make this clearer.
-      "//ui/android:ui_java",
-    ]
-  }
-} else {
-  mojo_native_application("html_viewer") {
-    sources = [
-      "html_viewer.cc",
-    ]
-    deps = [
-      ":lib",
-      "//ui/resources:ui_test_pak",
+  if (v8_use_external_startup_data) {
+    resources += [
+      "$root_build_dir/natives_blob.bin",
+      "$root_build_dir/snapshot_blob.bin",
     ]
-    data_deps = [ "//mojo/services/network:network" ]
   }
 }