diff options
| -rw-r--r-- | android_webview/android_webview.gyp | 84 | ||||
| -rw-r--r-- | android_webview/lib/main/aw_main_delegate.cc | 2 | ||||
| -rw-r--r-- | android_webview/snapshot_copying.gypi | 4 |
3 files changed, 41 insertions, 49 deletions
diff --git a/android_webview/android_webview.gyp b/android_webview/android_webview.gyp index bbd23c6..efb52db 100644 --- a/android_webview/android_webview.gyp +++ b/android_webview/android_webview.gyp @@ -15,6 +15,16 @@ '<(DEPTH)/third_party/WebKit/public/blink_resources.gyp:blink_resources', '<(DEPTH)/ui/resources/ui_resources.gyp:ui_resources', ], + 'variables': { + 'conditions': [ + ['target_arch=="arm" or target_arch=="ia32" or target_arch=="mipsel"', { + 'arch_suffix':'32' + }], + ['target_arch=="arm64" or target_arch=="x64" or target_arch=="mips64el"', { + 'arch_suffix':'64' + }], + ], + }, 'actions': [ { 'action_name': 'repack_android_webview_pack', @@ -51,52 +61,36 @@ '<@(locales)', ], }, - ], - 'conditions': [ - ['v8_use_external_startup_data==1', { - 'variables': { - 'conditions': [ - ['(target_arch=="arm" or target_arch=="ia32" or target_arch=="mipsel")', { - 'arch_suffix':'32' - }], - ['(target_arch=="arm64" or target_arch=="x64" or target_arch=="mips64el")', { - 'arch_suffix':'64' - }], - ], - }, - 'actions': [ - { - 'action_name': 'rename_snapshot_blob', - 'inputs': [ - '<(PRODUCT_DIR)/snapshot_blob.bin', - ], - 'outputs': [ - '<(PRODUCT_DIR)/snapshot_blob_<(arch_suffix).bin', - ], - 'action': [ - 'python', - '<(DEPTH)/build/cp.py', - '<@(_inputs)', - '<@(_outputs)', - ], - }, - { - 'action_name': 'rename_natives_blob', - 'inputs': [ - '<(PRODUCT_DIR)/natives_blob.bin', - ], - 'outputs': [ - '<(PRODUCT_DIR)/natives_blob_<(arch_suffix).bin', - ], - 'action': [ - 'python', - '<(DEPTH)/build/cp.py', - '<@(_inputs)', - '<@(_outputs)', - ], - }, + { + 'action_name': 'rename_snapshot_blob', + 'inputs': [ + '<(PRODUCT_DIR)/snapshot_blob.bin', + ], + 'outputs': [ + '<(PRODUCT_DIR)/snapshot_blob_<(arch_suffix).bin', + ], + 'action': [ + 'python', + '<(DEPTH)/build/cp.py', + '<@(_inputs)', + '<@(_outputs)', ], - }], + }, + { + 'action_name': 'rename_natives_blob', + 'inputs': [ + '<(PRODUCT_DIR)/natives_blob.bin', + ], + 'outputs': [ + '<(PRODUCT_DIR)/natives_blob_<(arch_suffix).bin', + ], + 'action': [ + 'python', + '<(DEPTH)/build/cp.py', + '<@(_inputs)', + '<@(_outputs)', + ], + }, ], }, { 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")); diff --git a/android_webview/snapshot_copying.gypi b/android_webview/snapshot_copying.gypi index 0a23a8c..01c6285 100644 --- a/android_webview/snapshot_copying.gypi +++ b/android_webview/snapshot_copying.gypi @@ -3,7 +3,7 @@ 'snapshot_additional_input_paths': [], 'snapshot_copy_files': [], 'conditions': [ - ['v8_use_external_startup_data==1 and (target_arch=="arm" or target_arch=="ia32" or target_arch=="mipsel")', { + ['target_arch=="arm" or target_arch=="ia32" or target_arch=="mipsel"', { 'snapshot_additional_input_paths': [ '<(asset_location)/natives_blob_32.bin', '<(asset_location)/snapshot_blob_32.bin', @@ -13,7 +13,7 @@ '<(PRODUCT_DIR)/snapshot_blob_32.bin', ], }], - ['v8_use_external_startup_data==1 and (target_arch=="arm64" or target_arch=="x64" or target_arch=="mips64el")', { + ['target_arch=="arm64" or target_arch=="x64" or target_arch=="mips64el"', { 'snapshot_additional_input_paths': [ '<(asset_location)/natives_blob_64.bin', '<(asset_location)/snapshot_blob_64.bin', |