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

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

Issue 2088373002: gn: define and use clang_base_path (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 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/sanitizers/BUILD.gn ('k') | build/toolchain/gcc_toolchain.gni » ('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 f0c815b0a0f20e8600e04f2091c8e41395998e2c..4a1a29f7eef579b3f97f4c45e397d7966ae05b6a 100644
--- a/build/toolchain/android/BUILD.gn
+++ b/build/toolchain/android/BUILD.gn
@@ -2,6 +2,7 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
+import("//build/config/clang/clang.gni")
import("//build/config/sysroot.gni") # Imports android/config.gni.
import("//build/toolchain/gcc_toolchain.gni")
@@ -42,8 +43,7 @@ template("android_gcc_toolchain") {
_tool_prefix = rebase_path("$_android_tool_prefix", root_build_dir)
if (is_clang) {
- _prefix = rebase_path("//third_party/llvm-build/Release+Asserts/bin",
- root_build_dir)
+ _prefix = rebase_path("$clang_base_path/bin", root_build_dir)
cc = "$_prefix/clang"
cxx = "$_prefix/clang++"
} else {
« no previous file with comments | « build/sanitizers/BUILD.gn ('k') | build/toolchain/gcc_toolchain.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698