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

Unified Diff: build/android/envsetup_functions.sh

Issue 10914266: Made clang use the gold linker for Android (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 3 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 | « build/android/arm-linux-androideabi-gold/ld ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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}
« no previous file with comments | « build/android/arm-linux-androideabi-gold/ld ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698