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)) {

[jbudorick, 2016/09/16 16:23:35]

nit: this might be more readable as

android_64bit_target_cpu && !(defined(build_64bit_only_webview) &&
build_64bit_only_webview))

[michaelbai, 2016/09/16 20:05:55]

could be more simple

android_64bit_target_cpu && ! 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") {

[jbudorick, 2016/09/16 16:23:35]

Can system_webview_apk_tmpl use
:libwebviewchromium($android_secondary_api_toolchain) directly?

[michaelbai, 2016/09/16 20:05:55]

Thanks to spot it, I were copying this from Monochrome, this needn't be a
separated target.

+    public_deps = [
+      ":libwebviewchromium($android_secondary_abi_toolchain)",
+    ]
+  }
+
+  android_assets("v8_snapshot_secondary_abi_assets") {

[jbudorick, 2016/09/16 16:23:35]

This appears to be unused. Are you planning to use it downstream...?

[Torne, 2016/09/16 16:37:57]

It will be used by the downstream monochrome target (with a corresponding change
that's yet to come); there isn't yet a public monochrome target, but we'll add
one at some point, so defining it here is useful.

[michaelbai, 2016/09/16 20:05:55]

It is used in line 161

+    _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") {
     deps = [
       ":webview_entry_point",