Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1945)

Unified Diff: android_webview/lib/main/aw_main_delegate.cc

Issue 903793002: Name V8 snapshot according to target architecture (32/64 bit). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: android_webview/lib/main/aw_main_delegate.cc
diff --git a/android_webview/lib/main/aw_main_delegate.cc b/android_webview/lib/main/aw_main_delegate.cc
index 8ad76578ffb1c0075fea0c22ae30e09e34dbd058..1b0f7344e70d41037674c25d5c720558a75ad726 100644
--- a/android_webview/lib/main/aw_main_delegate.cc
+++ b/android_webview/lib/main/aw_main_delegate.cc
@@ -92,10 +92,17 @@ bool AwMainDelegate::BasicStartupComplete(int* exit_code) {
// In multi-process mode this code would live in
// AwContentBrowserClient::GetAdditionalMappedFilesForChildProcess.
#ifdef V8_USE_EXTERNAL_STARTUP_DATA
+#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__
CHECK(AwAssets::RegisterAssetWithGlobalDescriptors(
- kV8NativesDataDescriptor, gin::IsolateHolder::kNativesFileName));
+ kV8NativesDataDescriptor, kNativesFileName));
CHECK(AwAssets::RegisterAssetWithGlobalDescriptors(
- kV8SnapshotDataDescriptor, gin::IsolateHolder::kSnapshotFileName));
+ kV8SnapshotDataDescriptor, kSnapshotFileName));
#endif
// TODO(mkosiba): make this CHECK when the android_webview_build uses an asset
// from the .apk too.

Powered by Google App Engine
This is Rietveld 408576698