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

Side by Side 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, 7 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 unified diff | Download patch
OLDNEW
1 # Copyright 2013 The Chromium Authors. All rights reserved. 1 # Copyright 2013 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 import("//build/config/sysroot.gni") # Imports android/config.gni. 5 import("//build/config/sysroot.gni") # Imports android/config.gni.
6 import("//build/toolchain/ccache.gni") 6 import("//build/toolchain/ccache.gni")
7 import("//build/toolchain/clang.gni") 7 import("//build/toolchain/clang.gni")
8 import("//build/toolchain/goma.gni") 8 import("//build/toolchain/goma.gni")
9 import("//build/toolchain/gcc_toolchain.gni") 9 import("//build/toolchain/gcc_toolchain.gni")
10 10
(...skipping 29 matching lines...) Expand all
40 assert(!use_ccache, "Goma and ccache can't be used together.") 40 assert(!use_ccache, "Goma and ccache can't be used together.")
41 compiler_prefix = "$goma_dir/gomacc " 41 compiler_prefix = "$goma_dir/gomacc "
42 } else if (use_ccache) { 42 } else if (use_ccache) {
43 compiler_prefix = "ccache " 43 compiler_prefix = "ccache "
44 } else { 44 } else {
45 compiler_prefix = "" 45 compiler_prefix = ""
46 } 46 }
47 47
48 is_clang = invoker.is_clang 48 is_clang = invoker.is_clang
49 if (is_clang) { 49 if (is_clang) {
50 prefix = rebase_path("//third_party/llvm-build/Release+Asserts/bin", 50 host_suffix = ""
51 if (host_os == "linux") {
52 host_suffix = "x86_64-linux"
53 } else if (host_os == "mac") {
54 host_suffix = "x86_64-darwin"
55 } else {
56 assert(false, "Unknown host")
57 }
58
59 prefix = rebase_path("//buildtools/toolchain/clang+llvm-$host_suffix/bin",
51 root_build_dir) 60 root_build_dir)
52 61
53 cc = compiler_prefix + prefix + "/clang" 62 cc = compiler_prefix + prefix + "/clang"
54 cxx = compiler_prefix + prefix + "/clang++" 63 cxx = compiler_prefix + prefix + "/clang++"
55 } else { 64 } else {
56 cc = compiler_prefix + tool_prefix + "gcc" 65 cc = compiler_prefix + tool_prefix + "gcc"
57 cxx = compiler_prefix + tool_prefix + "g++" 66 cxx = compiler_prefix + tool_prefix + "g++"
58 } 67 }
59 68
60 ar = tool_prefix + "ar" 69 ar = tool_prefix + "ar"
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
146 toolchain_cpu = "aarch64" 155 toolchain_cpu = "aarch64"
147 } 156 }
148 157
149 android_gcc_toolchains_helper("mips64el") { 158 android_gcc_toolchains_helper("mips64el") {
150 android_ndk_sysroot = "$android_ndk_root/$mips64_android_sysroot_subdir" 159 android_ndk_sysroot = "$android_ndk_root/$mips64_android_sysroot_subdir"
151 android_ndk_lib_dir = "usr/lib64" 160 android_ndk_lib_dir = "usr/lib64"
152 161
153 tool_prefix = "$mips64_android_toolchain_root/bin/mipsel-linux-android-" 162 tool_prefix = "$mips64_android_toolchain_root/bin/mipsel-linux-android-"
154 toolchain_cpu = "mipsel64el" 163 toolchain_cpu = "mipsel64el"
155 } 164 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698