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

android_webview/apk/system_webview_apk_common.gypi

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 #
 # When making changes remember that this is shared with the internal .apk
 # build rules.
 {
   'type': 'none',
   'dependencies': [
     '<(DEPTH)/android_webview/android_webview.gyp:libwebviewchromium',
@@ skipping 15 matching lines @@
       '<(asset_location)/webviewchromium.pak',
       '<(asset_location)/en-US.pak',
       '<(asset_location)/webview_licenses.notice',
     ],
     'conditions': [
       ['icu_use_data_file_flag==1', {
         'additional_input_paths': [
           '<(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',
+        ],
       }],
     ],
   },
   'copies': [
     {
       'destination': '<(asset_location)',
       'files': [
         '<(PRODUCT_DIR)/android_webview_assets/webviewchromium.pak',
         '<(PRODUCT_DIR)/android_webview_assets/en-US.pak',
       ],
       'conditions': [
         ['icu_use_data_file_flag==1', {
           'files': [
             '<(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.bin',
-            '<(PRODUCT_DIR)/snapshot_blob.bin',
+            '<(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_64.bin',
+            '<(PRODUCT_DIR)/snapshot_blob_64.bin',
           ],
         }],
       ],
     },
   ],
   'actions': [
     {
       'action_name': 'generate_webview_license_notice',
       'inputs': [
         '<!@(python <(DEPTH)/android_webview/tools/webview_licenses.py notice_deps)',
         '<(DEPTH)/android_webview/tools/licenses_notice.tmpl',
         '<(DEPTH)/android_webview/tools/webview_licenses.py',
       ],
       'outputs': [
         '<(asset_location)/webview_licenses.notice',
       ],
       'action': [
         'python',
         '<(DEPTH)/android_webview/tools/webview_licenses.py',
         'notice',
         '<(asset_location)/webview_licenses.notice',
       ],
       'message': 'Generating WebView license notice',
     },
   ],
   'includes': [ '../../build/java_apk.gypi' ],
 }