| Index: chrome/android/BUILD.gn
|
| diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
|
| index fdb91d6dce9f0f63e33daea7a27820f25f2ea8d8..fb18c38cb96b8c81768011fa723521e87ef5f466 100644
|
| --- a/chrome/android/BUILD.gn
|
| +++ b/chrome/android/BUILD.gn
|
| @@ -5,6 +5,7 @@
|
| import("//android_webview/webview_repack_locales_list.gni")
|
| import("//build/config/android/config.gni")
|
| import("//build/config/android/rules.gni")
|
| +import("//build/config/compiler/compiler.gni")
|
| import("//build/util/process_version.gni")
|
| import("//build_overrides/v8.gni")
|
| import("//chrome/android/chrome_public_apk_tmpl.gni")
|
| @@ -566,7 +567,7 @@ if (current_toolchain == default_toolchain) {
|
| generate_resource_whitelist("monochrome_resource_whitelist") {
|
| # Always use the 32-bit library's whitelist since the 64-bit one is
|
| # webview-only.
|
| - if (!android_64bit_target_cpu) {
|
| + if (!is_target_cpu_64bit) {
|
| _fat_lib_toolchain = current_toolchain
|
| } else {
|
| _fat_lib_toolchain = android_secondary_abi_toolchain
|
| @@ -620,7 +621,7 @@ if (current_toolchain == default_toolchain) {
|
| # with secondary 32-bit toolchain in 64-bit platform because we
|
| # need 64-bit //android_webview/monochrome and 32-bit this target
|
| # for 64-bit APK.
|
| -if (!android_64bit_target_cpu ||
|
| +if (!is_target_cpu_64bit ||
|
| current_toolchain == android_secondary_abi_toolchain) {
|
| shared_library("monochrome") {
|
| sources = [
|
|
|