diff options
| author | jbudorick <jbudorick@chromium.org> | 2015-10-23 13:54:40 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-10-23 20:56:19 +0000 |
| commit | 77a03f6624a369d01b565b46e3584d25ae41fb0b (patch) | |
| tree | dca800e84224c1a04139811a798c4c7dee777fc3 /gin | |
| parent | efac61aadc057f6e98ba628e68e5ad1d5c76053e (diff) | |
| download | chromium_src-77a03f6624a369d01b565b46e3584d25ae41fb0b.zip chromium_src-77a03f6624a369d01b565b46e3584d25ae41fb0b.tar.gz chromium_src-77a03f6624a369d01b565b46e3584d25ae41fb0b.tar.bz2 | |
Revert of Reland Switch Chrome Android using v8 arch specific external data name (patchset #3 id:40001 of https://codereview.chromium.org/1417753004/ )
Reason for revert:
broke gpu bots: https://build.chromium.org/p/chromium.gpu/builders/Android%20Debug%20%28Nexus%206%29/builds/3712
Original issue's description:
> 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
>
> Committed: https://crrev.com/ed31140dee44c06e6398e92e1afb9c047c9137e6
> Cr-Commit-Position: refs/heads/master@{#355843}
TBR=michaelbai@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=540788
Review URL: https://codereview.chromium.org/1421893002
Cr-Commit-Position: refs/heads/master@{#355877}
Diffstat (limited to 'gin')
| -rw-r--r-- | gin/v8_initializer.cc | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/gin/v8_initializer.cc b/gin/v8_initializer.cc index 8bcc78d..810225c 100644 --- a/gin/v8_initializer.cc +++ b/gin/v8_initializer.cc @@ -53,19 +53,8 @@ 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) |