diff options
| author | gsennton <gsennton@chromium.org> | 2015-06-09 07:47:42 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-06-09 14:48:09 +0000 |
| commit | 124ee912562f645d414647d25dd634ae8cfd9699 (patch) | |
| tree | aba159e48a532deeb2e203d5bca20de42f6343ec /android_webview/lib | |
| parent | 8751a8d7a2f64e8678d61f58edfcbb4dd83d4fdb (diff) | |
| download | chromium_src-124ee912562f645d414647d25dd634ae8cfd9699.zip chromium_src-124ee912562f645d414647d25dd634ae8cfd9699.tar.gz chromium_src-124ee912562f645d414647d25dd634ae8cfd9699.tar.bz2 | |
Remove v8 external flag in webview since that flag will always be set to true.
Remove the flag named v8_use_external_startup_data from webview since we
will always use external startup data.
BUG=455699
Review URL: https://codereview.chromium.org/1041783002
Cr-Commit-Position: refs/heads/master@{#333486}
Diffstat (limited to 'android_webview/lib')
| -rw-r--r-- | android_webview/lib/main/aw_main_delegate.cc | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/android_webview/lib/main/aw_main_delegate.cc b/android_webview/lib/main/aw_main_delegate.cc index fa67e9f..90d2389 100644 --- a/android_webview/lib/main/aw_main_delegate.cc +++ b/android_webview/lib/main/aw_main_delegate.cc @@ -104,7 +104,6 @@ bool AwMainDelegate::BasicStartupComplete(int* exit_code) { // content_main_runner that reads these values tries to do so. // In multi-process mode this code would live in // AwContentBrowserClient::GetAdditionalMappedFilesForChildProcess. -#ifdef V8_USE_EXTERNAL_STARTUP_DATA #ifdef __LP64__ const char kNativesFileName[] = "assets/natives_blob_64.bin"; const char kSnapshotFileName[] = "assets/snapshot_blob_64.bin"; @@ -119,7 +118,6 @@ bool AwMainDelegate::BasicStartupComplete(int* exit_code) { kV8NativesDataDescriptor, kNativesFileName)); CHECK(base::android::RegisterApkAssetWithGlobalDescriptors( kV8SnapshotDataDescriptor, kSnapshotFileName)); -#endif CHECK(base::android::RegisterApkAssetWithGlobalDescriptors( kAndroidICUDataDescriptor, "assets/icudtl.dat")); |