Chromium Code Reviews| Index: android_webview/BUILD.gn |
| diff --git a/android_webview/BUILD.gn b/android_webview/BUILD.gn |
| index 90949095041e38ff459b30d08fb080bca95e68b1..3cc810cf3fa26e45537a888965e9d4c48f330328 100644 |
| --- a/android_webview/BUILD.gn |
| +++ b/android_webview/BUILD.gn |
| @@ -156,6 +156,9 @@ android_assets("monochrome_webview_assets") { |
| "//third_party/icu:icu_assets", |
| "//v8:v8_external_startup_data_assets", |
| ] |
| + if (android_64bit_target_cpu && build_apk_secondary_abi) { |
| + deps += [ ":v8_snapshot_secondary_abi_assets" ] |
| + } |
| } |
| android_assets("assets") { |
| @@ -396,6 +399,20 @@ shared_library("libwebviewchromium") { |
| } |
| if (android_64bit_target_cpu) { |
| + android_assets("v8_snapshot_secondary_abi_assets") { |
| + _secondary_abi_out_dir = |
| + get_label_info(android_secondary_abi_toolchain, "root_out_dir") |
|
agrieve
2016/09/19 23:54:13
I don't think this is actually right. You need to
michaelbai
2016/09/20 00:29:43
Thanks for spotting this, it was merge error.
|
| + assert(android_64bit_target_cpu, |
| + "32-bit targets shouldn't have secondary abi") |
| + arch_suffix = "32" |
| + renaming_sources = [ "$_secondary_abi_out_dir/snapshot_blob.bin" ] |
| + renaming_destinations = [ "snapshot_blob_$arch_suffix.bin" ] |
| + disable_compression = true |
| + deps = [ |
| + "//v8($android_secondary_abi_toolchain)", |
| + ] |
| + } |
| + |
| shared_library("monochrome") { |
| deps = [ |
| ":webview_entry_point", |