| Index: build/toolchain/android/BUILD.gn
|
| diff --git a/build/toolchain/android/BUILD.gn b/build/toolchain/android/BUILD.gn
|
| index 9b3b162ca6d1d6789c48233314ada6e15d1bd729..e3f35d8550bd1327e11c327030e739f160d8ab52 100644
|
| --- a/build/toolchain/android/BUILD.gn
|
| +++ b/build/toolchain/android/BUILD.gn
|
| @@ -3,6 +3,7 @@
|
| # found in the LICENSE file.
|
|
|
| import("//build/config/clang/clang.gni")
|
| +import("//build/config/compiler/compiler.gni")
|
| import("//build/config/sysroot.gni") # Imports android/config.gni.
|
| import("//build/toolchain/gcc_toolchain.gni")
|
|
|
| @@ -26,7 +27,9 @@ template("android_gcc_toolchain") {
|
| toolchain_args.current_os = "android"
|
|
|
| # Output linker map files for binary size analysis.
|
| - enable_linker_map = true
|
| + # Currently disabled on LLD because of a bug (fixed upstream).
|
| + # See https://crbug.com/716209.
|
| + enable_linker_map = !use_lld
|
|
|
| # Make our manually injected libs relative to the build dir.
|
| _ndk_lib =
|
|
|