Reland Reland Switch Chrome Android using v8 arch specific external data name

gin/v8_initializer.cc

 // Copyright 2013 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.
 
 #include "gin/v8_initializer.h"
 
 #include "base/basictypes.h"
 #include "base/debug/alias.h"
 #include "base/files/file.h"
 #include "base/files/file_path.h"
@@ skipping 35 matching lines @@
 #endif
 
 // File handles intentionally never closed. Not using File here because its
 // Windows implementation guards against two instances owning the same
 // PlatformFile (which we allow since we know it is never freed).
 base::PlatformFile g_natives_pf = kInvalidPlatformFile;
 base::PlatformFile g_snapshot_pf = kInvalidPlatformFile;
 base::MemoryMappedFile::Region g_natives_region;
 base::MemoryMappedFile::Region g_snapshot_region;
 
+#if defined(OS_ANDROID)
+#ifdef __LP64__
+const char kNativesFileName[] = "natives_blob_64.bin";
+const char kSnapshotFileName[] = "snapshot_blob_64.bin";
+#else
+const char kNativesFileName[] = "natives_blob_32.bin";
+const char kSnapshotFileName[] = "snapshot_blob_32.bin";
+#endif // __LP64__
+
+#else  // defined(OS_ANDROID)
 const char kNativesFileName[] = "natives_blob.bin";
 const char kSnapshotFileName[] = "snapshot_blob.bin";
+#endif  // defined(OS_ANDROID)
 
 void GetV8FilePath(const char* file_name, base::FilePath* path_out) {
 #if !defined(OS_MACOSX)
   base::FilePath data_path;
 #if defined(OS_ANDROID)
   // This is the path within the .apk.
   data_path = base::FilePath(FILE_PATH_LITERAL("assets"));
 #elif defined(OS_POSIX)
   PathService::Get(base::DIR_EXE, &data_path);
 #elif defined(OS_WIN)
@@ skipping 331 matching lines @@
     *snapshot_data_out =
         reinterpret_cast<const char*>(g_mapped_snapshot->data());
     *snapshot_size_out = static_cast<int>(g_mapped_snapshot->length());
   } else {
     *snapshot_data_out = NULL;
     *snapshot_size_out = 0;
   }
 }
 
 }  // namespace gin