| Index: chrome/android/chrome_public_apk_tmpl.gni
|
| diff --git a/chrome/android/chrome_public_apk_tmpl.gni b/chrome/android/chrome_public_apk_tmpl.gni
|
| index 5c98830dc8f0a79d248db8bab150f8ccafa4c173..accb1b91fc44488ac7120ac7333fb6418497393e 100644
|
| --- a/chrome/android/chrome_public_apk_tmpl.gni
|
| +++ b/chrome/android/chrome_public_apk_tmpl.gni
|
| @@ -4,6 +4,7 @@
|
|
|
| import("//base/android/linker/config.gni")
|
| import("//build/config/android/rules.gni")
|
| +import("//build/config/compiler/compiler.gni")
|
| import("//chrome/common/features.gni")
|
| import("//third_party/leakcanary/config.gni")
|
| import("channel.gni")
|
| @@ -81,12 +82,12 @@ template("monochrome_public_apk_tmpl") {
|
| chrome_public_apk_tmpl(target_name) {
|
| # Always build 64-bit //android_webview:monochrome because Chrome runs
|
| # in 32-bit mode.
|
| - if (android_64bit_target_cpu) {
|
| + if (is_target_cpu_64bit) {
|
| shared_libraries = [ "//android_webview:monochrome" ]
|
| } else {
|
| shared_libraries = [ "//chrome/android:monochrome" ]
|
| }
|
| - if (android_64bit_target_cpu && build_apk_secondary_abi) {
|
| + if (is_target_cpu_64bit && build_apk_secondary_abi) {
|
| secondary_abi_shared_libraries =
|
| [ "//chrome/android:monochrome_secondary_abi_lib" ]
|
| }
|
|
|