| Index: build/toolchain/android/BUILD.gn
|
| diff --git a/build/toolchain/android/BUILD.gn b/build/toolchain/android/BUILD.gn
|
| index ed7c407ce0f65ae759aad7c1d097e5f8e8622c21..749d28b60ad1164989c97b172426a611da69479b 100644
|
| --- a/build/toolchain/android/BUILD.gn
|
| +++ b/build/toolchain/android/BUILD.gn
|
| @@ -4,7 +4,6 @@
|
|
|
| import("//build/config/sysroot.gni") # Imports android/config.gni.
|
| import("//build/toolchain/ccache.gni")
|
| -import("//build/toolchain/clang.gni")
|
| import("//build/toolchain/goma.gni")
|
| import("//build/toolchain/gcc_toolchain.gni")
|
|
|
| @@ -47,13 +46,8 @@ template("android_gcc_toolchain") {
|
|
|
| is_clang = invoker.is_clang
|
| if (is_clang) {
|
| - if (use_clang_type_profiler) {
|
| - prefix = rebase_path("//third_party/llvm-allocated-type/Linux_x64/bin",
|
| - root_build_dir)
|
| - } else {
|
| - prefix = rebase_path("//third_party/llvm-build/Release+Asserts/bin",
|
| - root_build_dir)
|
| - }
|
| + prefix = rebase_path("//third_party/llvm-build/Release+Asserts/bin",
|
| + root_build_dir)
|
| cc = "${compiler_prefix}$prefix/clang"
|
| cxx = "${compiler_prefix}$prefix/clang++"
|
| } else {
|
|
|