| Index: build/android/envsetup_functions.sh
|
| diff --git a/build/android/envsetup_functions.sh b/build/android/envsetup_functions.sh
|
| index 9a756a46c86b55fa1a54111682db8b95f9d0b657..55910a66e15ace2fa95bf60599b6e7fe2ba47358 100755
|
| --- a/build/android/envsetup_functions.sh
|
| +++ b/build/android/envsetup_functions.sh
|
| @@ -48,6 +48,13 @@ common_vars_defines() {
|
| export PATH=$PATH:${ANDROID_NDK_ROOT}
|
| export PATH=$PATH:${ANDROID_SDK_ROOT}/tools
|
| export PATH=$PATH:${ANDROID_SDK_ROOT}/platform-tools
|
| +
|
| + # This must be set before ANDROID_TOOLCHAIN, so that clang could find the
|
| + # gold linker.
|
| + # TODO(michaelbai): Remove this path once the gold linker become the default
|
| + # linker.
|
| + export PATH=$PATH:${CHROME_SRC}/build/android/${toolchain_arch}-gold
|
| +
|
| # Must have tools like arm-linux-androideabi-gcc on the path for ninja
|
| export PATH=$PATH:${ANDROID_TOOLCHAIN}
|
|
|
|
|