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..ecb3ebfadb5a1ef8bc59ffbd7ee6b12a4fa389b7 100644
--- a/android_webview/BUILD.gn
+++ b/android_webview/BUILD.gn
@@ -156,6 +156,9 @@ android_assets("monochrome_webview_assets") {
     "//third_party/icu:icu_assets",
     "//v8:v8_external_startup_data_assets",
   ]
+  if (android_64bit_target_cpu && !build_64bit_only_webview) {

[Torne, 2016/09/19 13:36:28]

Doesn't this file need to include the new config.gni file to be able to check
this variable?

[michaelbai, 2016/09/19 21:22:25]

No, it doesn't, build_64bit_only_webview's definition comes from
system_webview_apk_tmpl.gni which imports android_webview/config.gni.

+    deps += [ ":v8_snapshot_secondary_abi_assets" ]
+  }
 }
 
 android_assets("assets") {
@@ -396,6 +399,23 @@ shared_library("libwebviewchromium") {
 }
 
 if (android_64bit_target_cpu) {
+  android_assets("v8_snapshot_secondary_abi_assets") {
+    _secondary_abi_toolchain_name =
+        get_label_info(android_secondary_abi_toolchain, "name")
+    _secondary_abi_out_dir =

[agrieve, 2016/09/19 14:29:18]

it would be better to get this via:


_secondary_abi_out_dir =
get_label_info("//v8($android_secondary_abi_toolchain)", "root_out_dir")

[michaelbai, 2016/09/19 21:22:26]

Done.

+        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",