diff options
| author | michaelbai <michaelbai@chromium.org> | 2015-10-23 11:46:10 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-10-23 18:49:07 +0000 |
| commit | ed31140dee44c06e6398e92e1afb9c047c9137e6 (patch) | |
| tree | 2ee30c514695f5ed4e1b45112a897831761870e1 /gin | |
| parent | fc76b7e7f854c3791e683f3c9e81d27d9812be78 (diff) | |
| download | chromium_src-ed31140dee44c06e6398e92e1afb9c047c9137e6.zip chromium_src-ed31140dee44c06e6398e92e1afb9c047c9137e6.tar.gz chromium_src-ed31140dee44c06e6398e92e1afb9c047c9137e6.tar.bz2 | |
Orignal patch
https://codereview.chromium.org/1400953002/
Switch Chrome Android using v8 arch specific external data name
For 32-bit, natives_blob_32.bin and snapshot_blob_32.bin are used.
For 64-bit, natives_blob_64.bin and natives_blob_64.bin are used.
This patch also removed the existing v8 startup data in
destination directory by using copy_ex to remove directory
first.
BUG=540788
TBR=jochen@chromium.org,dpranke@chromium.org,halliwell@chromium.org,jbudorick@chromium.org,mef@chromium.org,rmcilroy@chromium.org,dtrainor@chromium.org,cpu@chromium.org
Review URL: https://codereview.chromium.org/1417753004
Cr-Commit-Position: refs/heads/master@{#355843}
Diffstat (limited to 'gin')
| -rw-r--r-- | gin/v8_initializer.cc | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/gin/v8_initializer.cc b/gin/v8_initializer.cc index 810225c..8bcc78d 100644 --- a/gin/v8_initializer.cc +++ b/gin/v8_initializer.cc @@ -53,8 +53,19 @@ 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) |