Remove natives_blob.bin's arch dependence.

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 <stddef.h>
 #include <stdint.h>
 
 #include <memory>
@@ skipping 45 matching lines @@
 
 OpenedFileMap::mapped_type& GetOpenedFile(const char* file) {
   OpenedFileMap& opened_files(g_opened_files.Get());
   if (opened_files.find(file) == opened_files.end()) {
     opened_files[file] = std::make_pair(base::kInvalidPlatformFile,
                                         base::MemoryMappedFile::Region());
   }
   return opened_files[file];
 }
 
+const char kNativesFileName[] = "natives_blob.bin";
+
 #if defined(OS_ANDROID)
-const char kNativesFileName64[] = "natives_blob_64.bin";
 const char kSnapshotFileName64[] = "snapshot_blob_64.bin";
-const char kNativesFileName32[] = "natives_blob_32.bin";
 const char kSnapshotFileName32[] = "snapshot_blob_32.bin";
 
 #if defined(__LP64__)
-#define kNativesFileName kNativesFileName64
 #define kSnapshotFileName kSnapshotFileName64
 #else
-#define kNativesFileName kNativesFileName32
 #define kSnapshotFileName kSnapshotFileName32
 #endif
 
 #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)
@@ skipping 289 matching lines @@
 base::PlatformFile V8Initializer::GetOpenSnapshotFileForChildProcesses(
     base::MemoryMappedFile::Region* region_out) {
   const OpenedFileMap::mapped_type& opened =
       OpenFileIfNecessary(kSnapshotFileName);
   *region_out = opened.second;
   return opened.first;
 }
 
 #if defined(OS_ANDROID)
 // static
-base::PlatformFile V8Initializer::GetOpenNativesFileForChildProcesses(
-    base::MemoryMappedFile::Region* region_out,
-    bool abi_32_bit) {
-  const char* natives_file =
-      abi_32_bit ? kNativesFileName32 : kNativesFileName64;
-  const OpenedFileMap::mapped_type& opened = OpenFileIfNecessary(natives_file);
-  *region_out = opened.second;
-  return opened.first;
-}
-
-// static
 base::PlatformFile V8Initializer::GetOpenSnapshotFileForChildProcesses(
     base::MemoryMappedFile::Region* region_out,
     bool abi_32_bit) {
   const char* snapshot_file =
       abi_32_bit ? kSnapshotFileName32 : kSnapshotFileName64;
   const OpenedFileMap::mapped_type& opened = OpenFileIfNecessary(snapshot_file);
   *region_out = opened.second;
   return opened.first;
 }
 
 // static
-base::FilePath V8Initializer::GetNativesFilePath(bool abi_32_bit) {
+base::FilePath V8Initializer::GetNativesFilePath() {
   base::FilePath path;
-  GetV8FilePath(abi_32_bit ? kNativesFileName32 : kNativesFileName64, &path);
+  GetV8FilePath(kNativesFileName, &path);
   return path;
 }
 
 // static
 base::FilePath V8Initializer::GetSnapshotFilePath(bool abi_32_bit) {
   base::FilePath path;
   GetV8FilePath(abi_32_bit ? kSnapshotFileName32 : kSnapshotFileName64, &path);
   return path;
 }
 #endif  // defined(OS_ANDROID)
@@ skipping 71 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