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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 3010023002: Reland: [infra] Roll clang toolchain forward (Closed)
Patch Set: Created 3 years, 3 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/config/compiler/BUILD.gn ('k') | build/toolchain/linux/BUILD.gn » ('j') | no next file with comments »
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 f6806099e7749492bbae7881753659fd16a97e73..2560e4c9f274e587337f02d647263e6162635906 100644
--- a/build/toolchain/android/BUILD.gn
+++ b/build/toolchain/android/BUILD.gn
@@ -47,17 +47,8 @@ template("android_gcc_toolchain") {
is_clang = invoker.is_clang
if (is_clang) {
- 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)
+ prefix =
+ rebase_path("//buildtools/${host_os}-x64/clang/bin", root_build_dir)
cc = compiler_prefix + prefix + "/clang"
cxx = compiler_prefix + prefix + "/clang++"
« no previous file with comments | « build/config/compiler/BUILD.gn ('k') | build/toolchain/linux/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698