summaryrefslogtreecommitdiffstats
path: root/gin
diff options
context:
space:
mode:
authordalecurtis <dalecurtis@chromium.org>2015-10-22 18:07:02 -0700
committerCommit bot <commit-bot@chromium.org>2015-10-23 01:08:00 +0000
commitc2574ed2dede52cbf0353a3aca99d96cf0794571 (patch)
treee43b61b88914a189740442daaa59b0743c513ad2 /gin
parent0232219b2a00e7366adffd716e61d53a3c842f23 (diff)
downloadchromium_src-c2574ed2dede52cbf0353a3aca99d96cf0794571.zip
chromium_src-c2574ed2dede52cbf0353a3aca99d96cf0794571.tar.gz
chromium_src-c2574ed2dede52cbf0353a3aca99d96cf0794571.tar.bz2
Revert of Switch Chrome Android using v8 arch specific external data name (patchset #5 id:80001 of https://codereview.chromium.org/1400953002/ )
Reason for revert: Looks to have broken various Android Mojo tests: http://build.chromium.org/p/chromium.linux/buildstatus?builder=Android%20GN&number=31621 http://build.chromium.org/p/chromium.linux/buildstatus?builder=Android%20GN&number=31622 Original issue's description: > 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 > > Committed: https://crrev.com/979b03a19f63b1cbe02fa3df99707c3f93f7c9cf > Cr-Commit-Position: refs/heads/master@{#355680} 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,jam@chromium.org,michaelbai@chromium.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=540788 Review URL: https://codereview.chromium.org/1419673008 Cr-Commit-Position: refs/heads/master@{#355697}
Diffstat (limited to 'gin')
-rw-r--r--gin/v8_initializer.cc11
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)