build full 64bit WebView

android_webview/BUILD.gn

Index: android_webview/BUILD.gn
diff --git a/android_webview/BUILD.gn b/android_webview/BUILD.gn
index 90949095041e38ff459b30d08fb080bca95e68b1..3036df8cb752adfc2fc72472405ab3dc3786772f 100644
--- a/android_webview/BUILD.gn
+++ b/android_webview/BUILD.gn
@@ -156,6 +156,10 @@ android_assets("monochrome_webview_assets") {
     "//third_party/icu:icu_assets",
     "//v8:v8_external_startup_data_assets",
   ]
+  if (android_64bit_target_cpu &&
+      (!defined(build_64bit_only_webview) || !build_64bit_only_webview)) {
+    deps += [ ":v8_snapshot_secondary_abi_assets" ]
+  }
 }
 
 android_assets("assets") {
@@ -396,6 +400,29 @@ shared_library("libwebviewchromium") {
 }
 
 if (android_64bit_target_cpu) {
+  group("webviewchromium_secondary_abi_lib") {
+    public_deps = [
+      ":libwebviewchromium($android_secondary_abi_toolchain)",
+    ]
+  }
+
+  android_assets("v8_snapshot_secondary_abi_assets") {
+    _secondary_abi_toolchain_name =
+        get_label_info(android_secondary_abi_toolchain, "name")
+    _secondary_abi_out_dir =
+        rebase_path("$root_build_dir/$_secondary_abi_toolchain_name")
+
+    assert(android_64bit_target_cpu,
+           "32-bit targets shouldn't have secondary abi")
+    arch_suffix = "32"
+    renaming_sources = [ "$_secondary_abi_out_dir/snapshot_blob.bin" ]
+    renaming_destinations = [ "snapshot_blob_$arch_suffix.bin" ]
+    disable_compression = true
+    deps = [
+      "//v8($android_secondary_abi_toolchain)",
+    ]
+  }
+
   shared_library("monochrome") {

[Torne, 2016/09/16 14:04:18]

I know you aren't introducing this in this CL, but does this mean that there's
always a "monochrome" target defined in android_webview, even in a normal build?
It seems like this should only be defined when
merge_64bit_webview_and_monochrome is set to avoid confusion, unless I'm missing
something.

[michaelbai, 2016/09/16 16:14:22]

This target is also needed for build 64-bit Monochrome without merging, this is
64-bit shared library in it.

[Torne, 2016/09/16 16:35:33]

Oops, yes. Sorry :)

     deps = [
       ":webview_entry_point",