Index: chrome/android/BUILD.gn |
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn |
index 75e6228e2541b9821dac54a3102a817da1ac3dc7..00ad0be70efec0975554d198c904a65434cec187 100644 |
--- a/chrome/android/BUILD.gn |
+++ b/chrome/android/BUILD.gn |
@@ -458,7 +458,12 @@ shared_library("chrome") { |
} |
# GYP: none |
-if (!defined(webview_only_libmonochrome) || !webview_only_libmonochrome) { |
+# |
+# //chrome/android/monochrome is only needed in two cases |
+# - build with 32-bit default_toolchain, |
+# - or build with 32-bit android_secondary_abi_toolchain. |
+if (!android_64bit_target_cpu || |
+ current_toolchain == android_secondary_abi_toolchain) { |
shared_library("monochrome") { |
sources = chrome_apk_gypi.monochrome_app_native_sources |
deps = [ |
@@ -473,6 +478,12 @@ if (!defined(webview_only_libmonochrome) || !webview_only_libmonochrome) { |
public_configs = extra_chrome_shared_library_configs |
} |
+} else { |
+ group("monochrome_secondary_abi_lib") { |
+ public_deps = [ |
+ ":monochrome($android_secondary_abi_toolchain)", |
+ ] |
+ } |
} |
# GYP: //chrome/android/chrome_apk.gyp:libchrome_sync_shell |