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

Unified Diff: build/config/BUILDCONFIG.gn

Issue 426533003: Use clang as host compiler on android with gn too. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 4 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/BUILDCONFIG.gn
diff --git a/build/config/BUILDCONFIG.gn b/build/config/BUILDCONFIG.gn
index b05247e92ee117c7cfa055aa8d2112d530b5416e..dfa9c3bbb15a80df898703e4ebfb1773d173a67a 100644
--- a/build/config/BUILDCONFIG.gn
+++ b/build/config/BUILDCONFIG.gn
@@ -455,12 +455,11 @@ if (is_win) {
}
} else if (is_android) {
# Use clang for the x86/64 Linux host builds.
- # (Disabled until the Clang build works properly.)
- #if (build_cpu_arch == "x86" || build_cpu_arch == "x64") {
- # host_toolchain = "//build/toolchain/linux:clang_$build_cpu_arch"
- #} else {
+ if (build_cpu_arch == "x86" || build_cpu_arch == "x64") {
+ host_toolchain = "//build/toolchain/linux:clang_$build_cpu_arch"
+ } else {
host_toolchain = "//build/toolchain/linux:$build_cpu_arch"
- #}
+ }
set_default_toolchain("//build/toolchain/android:$cpu_arch")
} else if (is_linux) {
if (is_clang) {
« 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