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

Unified Diff: build/config/android/config.gni

Issue 2121833002: 🎢 Add a GN assert preventing android templates in non-default toolchain (Closed) 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/config/android/config.gni
diff --git a/build/config/android/config.gni b/build/config/android/config.gni
index 47c14e63d907fb20eb31451a662e676b333a95f3..3590205c37b8057ede2f66c78cd6eb59b16b5093 100644
--- a/build/config/android/config.gni
+++ b/build/config/android/config.gni
@@ -11,6 +11,13 @@ if (is_android) {
import("//build_overrides/build.gni")
+ # Disable all java-related templates in secondary toolchains. Java is not
+ # toolchain-dependent, so a variation on toolchains is likely a mistake.
+ if (enable_java_templates) {
+ assert(current_toolchain == default_toolchain,
+ "Android templates should be used only by the default toolchain.")
+ }
+
has_chrome_android_internal =
exec_script("//build/dir_exists.py",
[ rebase_path("//clank", root_build_dir) ],
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698