Fix wrong lib directory for x64 and mips64el target.

Linker report incompatible target errors on crtbegin_so.o and
crtend_so.o because /usr/lib is set incorrectly on x64 target.

mips64el is also changed and arm64 keep use /usr/lib after checking
each platform ndk toolchains but not verified because no environment.

BUG=none

Review URL: https://codereview.chromium.org/912273002

Cr-Original-Commit-Position: refs/heads/master@{#316128}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 964602788cc2d0a2b0cb89fcbe1691852d25f251
This commit is contained in:
halton.huo 2015-02-12 18:01:23 -08:00 коммит произвёл Commit bot
Родитель 40f2a91bb7
Коммит 5b99dcae1f
1 изменённых файлов: 2 добавлений и 2 удалений
toolchain/android

Просмотреть файл

@ -106,7 +106,7 @@ android_gcc_toolchain("mipsel") {
android_gcc_toolchain("x64") {
android_ndk_sysroot = "$android_ndk_root/$x86_64_android_sysroot_subdir"
android_ndk_lib_dir = "usr/lib"
android_ndk_lib_dir = "usr/lib64"
tool_prefix = "$x86_64_android_toolchain_root/bin/x86_64-linux-android-"
toolchain_cpu_arch = "x86_64"
@ -122,7 +122,7 @@ android_gcc_toolchain("arm64") {
android_gcc_toolchain("mips64el") {
android_ndk_sysroot = "$android_ndk_root/$mips64_android_sysroot_subdir"
android_ndk_lib_dir = "usr/lib"
android_ndk_lib_dir = "usr/lib64"
tool_prefix = "$mips64_android_toolchain_root/bin/mipsel-linux-android-"
toolchain_cpu_arch = "mipsel64el"