| Index: android_webview/BUILD.gn
|
| diff --git a/android_webview/BUILD.gn b/android_webview/BUILD.gn
|
| index 1d91d4ec611b1feb2171731a34bd464440b96c76..cc920ac54cedec4d6c640f17bd7c67cb6b01f55b 100644
|
| --- a/android_webview/BUILD.gn
|
| +++ b/android_webview/BUILD.gn
|
| @@ -6,6 +6,7 @@ import("//android_webview/system_webview_apk_tmpl.gni")
|
| import("//android_webview/webview_repack_locales.gni")
|
| import("//build/config/android/config.gni")
|
| import("//build/config/android/rules.gni")
|
| +import("//build/config/compiler/compiler.gni")
|
| import("//build/config/locales.gni")
|
| import("//components/spellcheck/spellcheck_build_features.gni")
|
| import("//tools/grit/repack.gni")
|
| @@ -130,7 +131,7 @@ 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) {
|
| + if (is_target_cpu_64bit && build_apk_secondary_abi) {
|
| deps += [ ":v8_snapshot_secondary_abi_assets" ]
|
| }
|
| }
|
| @@ -272,12 +273,11 @@ shared_library("libwebviewchromium") {
|
| configs -= [ "//build/config/android:hide_native_jni_exports" ]
|
| }
|
|
|
| -if (android_64bit_target_cpu) {
|
| +if (is_target_cpu_64bit) {
|
| android_assets("v8_snapshot_secondary_abi_assets") {
|
| _secondary_abi_out_dir =
|
| get_label_info("//v8($android_secondary_abi_toolchain)", "root_out_dir")
|
| - assert(android_64bit_target_cpu,
|
| - "32-bit targets shouldn't have secondary abi")
|
| + assert(is_target_cpu_64bit, "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" ]
|
|
|