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

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

Issue 1156573008: Allow OpenApkAsset() to open resource files as well as assets. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 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 60ad9f82405d449e65b6ff73387770f264385d60..fa67e9faca2729da076a3b63a911adbbf5030685 100644
--- a/android_webview/lib/main/aw_main_delegate.cc
+++ b/android_webview/lib/main/aw_main_delegate.cc
@@ -106,11 +106,11 @@ bool AwMainDelegate::BasicStartupComplete(int* exit_code) {
// AwContentBrowserClient::GetAdditionalMappedFilesForChildProcess.
#ifdef V8_USE_EXTERNAL_STARTUP_DATA
#ifdef __LP64__
- const char kNativesFileName[] = "natives_blob_64.bin";
- const char kSnapshotFileName[] = "snapshot_blob_64.bin";
+ const char kNativesFileName[] = "assets/natives_blob_64.bin";
+ const char kSnapshotFileName[] = "assets/snapshot_blob_64.bin";
#else
- const char kNativesFileName[] = "natives_blob_32.bin";
- const char kSnapshotFileName[] = "snapshot_blob_32.bin";
+ const char kNativesFileName[] = "assets/natives_blob_32.bin";
+ const char kSnapshotFileName[] = "assets/snapshot_blob_32.bin";
#endif // __LP64__
// TODO(gsennton) we should use
// gin::IsolateHolder::kNativesFileName/kSnapshotFileName
@@ -121,7 +121,7 @@ bool AwMainDelegate::BasicStartupComplete(int* exit_code) {
kV8SnapshotDataDescriptor, kSnapshotFileName));
#endif
CHECK(base::android::RegisterApkAssetWithGlobalDescriptors(
- kAndroidICUDataDescriptor, base::i18n::kIcuDataFileName));
+ kAndroidICUDataDescriptor, "assets/icudtl.dat"));
return false;
}
« no previous file with comments | « android_webview/browser/aw_browser_main_parts.cc ('k') | android_webview/native/aw_media_url_interceptor.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698