Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(428)

Unified Diff: chrome/android/BUILD.gn

Issue 2138163002: try v8 Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « build/toolchain/linux/BUILD.gn ('k') | chrome/test/base/js2gtest.gni » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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
« no previous file with comments | « build/toolchain/linux/BUILD.gn ('k') | chrome/test/base/js2gtest.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698