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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: build/toolchain/android/BUILD.gn

Issue 2854583002: [infra] Roll clang to match the version used by Flutter (Closed)
Patch Set: Fixes for Windows Created 3 years, 8 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
« DEPS ('K') | « build/config/compiler/BUILD.gn ('k') | build/toolchain/linux/BUILD.gn » ('j') | tools/buildtools/update.py » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/toolchain/android/BUILD.gn
diff --git a/build/toolchain/android/BUILD.gn b/build/toolchain/android/BUILD.gn
index 5e4847349d11342271e9d3ed8f7737de1e5f5372..90e1256da8018fea3cc0291148fcf58c82370024 100644
--- a/build/toolchain/android/BUILD.gn
+++ b/build/toolchain/android/BUILD.gn
@@ -47,7 +47,16 @@ template("android_gcc_toolchain") {
is_clang = invoker.is_clang
if (is_clang) {
- prefix = rebase_path("//third_party/llvm-build/Release+Asserts/bin",
+ host_suffix = ""
+ if (host_os == "linux") {
+ host_suffix = "x86_64-linux"
+ } else if (host_os == "mac") {
+ host_suffix = "x86_64-darwin"
+ } else {
+ assert(false, "Unknown host")
+ }
+
+ prefix = rebase_path("//buildtools/toolchain/clang+llvm-$host_suffix/bin",
root_build_dir)
cc = compiler_prefix + prefix + "/clang"
« DEPS ('K') | « build/config/compiler/BUILD.gn ('k') | build/toolchain/linux/BUILD.gn » ('j') | tools/buildtools/update.py » ('J')

Powered by Google App Engine
This is Rietveld 408576698