Name V8 snapshot according to target architecture (32/64 bit).

android_webview/apk/system_webview_apk_common.gypi

Index: android_webview/apk/system_webview_apk_common.gypi
diff --git a/android_webview/apk/system_webview_apk_common.gypi b/android_webview/apk/system_webview_apk_common.gypi
index dae95acb1549adf5184830d303fd6f277f2d44a5..547f0ae72ff7f9efcf4ee0ca3856cdcfc506a380 100644
--- a/android_webview/apk/system_webview_apk_common.gypi
+++ b/android_webview/apk/system_webview_apk_common.gypi
@@ -33,11 +33,17 @@
           '<(asset_location)/icudtl.dat',
         ],
       }],
-      ['v8_use_external_startup_data==1', {
+      ['v8_use_external_startup_data==1 and (target_arch=="arm" or target_arch=="x86" or target_arch=="mips")', {

[Torne, 2015/02/06 12:17:24]

We should probably put this section in a .gypi file since it's repeated three
times.

         'additional_input_paths': [
-          '<(asset_location)/natives_blob.bin',
-          '<(asset_location)/snapshot_blob.bin',
-        ],
+	  '<(asset_location)/natives_blob_32.bin',
+	  '<(asset_location)/snapshot_blob_32.bin',
+	],
+      }],
+      ['v8_use_external_startup_data==1 and (target_arch=="arm64" or target_arch=="x86_64" or target_arch=="mips64")', {
+        'additional_input_paths': [
+	  '<(asset_location)/natives_blob_64.bin',
+	  '<(asset_location)/snapshot_blob_64.bin',
+	],
       }],
     ],
   },
@@ -54,10 +60,16 @@
             '<(PRODUCT_DIR)/icudtl.dat',
           ],
         }],
-        ['v8_use_external_startup_data==1', {
+        ['v8_use_external_startup_data==1 and (target_arch=="arm" or target_arch=="x86" or target_arch=="mips")', {
+          'files': [
+            '<(PRODUCT_DIR)/natives_blob_32.bin',
+            '<(PRODUCT_DIR)/snapshot_blob_32.bin',
+          ],
+        }],
+        ['v8_use_external_startup_data==1 and (target_arch=="arm64" or target_arch=="x86_64" or target_arch=="mips64")', {
           'files': [
-            '<(PRODUCT_DIR)/natives_blob.bin',
-            '<(PRODUCT_DIR)/snapshot_blob.bin',
+            '<(PRODUCT_DIR)/natives_blob_64.bin',
+            '<(PRODUCT_DIR)/snapshot_blob_64.bin',
           ],
         }],
       ],