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

Side by Side Diff: build/toolchain/android/BUILD.gn

Issue 912273002: Fix wrong lib directory for x64 and mips64el target. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 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 unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2013 The Chromium Authors. All rights reserved. 1 # Copyright 2013 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 import("//build/config/sysroot.gni") # Imports android/config.gni. 5 import("//build/config/sysroot.gni") # Imports android/config.gni.
6 import("//build/toolchain/ccache.gni") 6 import("//build/toolchain/ccache.gni")
7 import("//build/toolchain/clang.gni") 7 import("//build/toolchain/clang.gni")
8 import("//build/toolchain/goma.gni") 8 import("//build/toolchain/goma.gni")
9 import("//build/toolchain/gcc_toolchain.gni") 9 import("//build/toolchain/gcc_toolchain.gni")
10 10
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
99 android_gcc_toolchain("mipsel") { 99 android_gcc_toolchain("mipsel") {
100 android_ndk_sysroot = "$android_ndk_root/$mips_android_sysroot_subdir" 100 android_ndk_sysroot = "$android_ndk_root/$mips_android_sysroot_subdir"
101 android_ndk_lib_dir = "usr/lib" 101 android_ndk_lib_dir = "usr/lib"
102 102
103 tool_prefix = "$mips_android_toolchain_root/bin/mipsel-linux-android-" 103 tool_prefix = "$mips_android_toolchain_root/bin/mipsel-linux-android-"
104 toolchain_cpu_arch = "mipsel" 104 toolchain_cpu_arch = "mipsel"
105 } 105 }
106 106
107 android_gcc_toolchain("x64") { 107 android_gcc_toolchain("x64") {
108 android_ndk_sysroot = "$android_ndk_root/$x86_64_android_sysroot_subdir" 108 android_ndk_sysroot = "$android_ndk_root/$x86_64_android_sysroot_subdir"
109 android_ndk_lib_dir = "usr/lib" 109 android_ndk_lib_dir = "usr/lib64"
110 110
111 tool_prefix = "$x86_64_android_toolchain_root/bin/x86_64-linux-android-" 111 tool_prefix = "$x86_64_android_toolchain_root/bin/x86_64-linux-android-"
112 toolchain_cpu_arch = "x86_64" 112 toolchain_cpu_arch = "x86_64"
113 } 113 }
114 114
115 android_gcc_toolchain("arm64") { 115 android_gcc_toolchain("arm64") {
116 android_ndk_sysroot = "$android_ndk_root/$arm64_android_sysroot_subdir" 116 android_ndk_sysroot = "$android_ndk_root/$arm64_android_sysroot_subdir"
117 android_ndk_lib_dir = "usr/lib" 117 android_ndk_lib_dir = "usr/lib"
118 118
119 tool_prefix = "$arm64_android_toolchain_root/bin/arm-linux-androideabi-" 119 tool_prefix = "$arm64_android_toolchain_root/bin/arm-linux-androideabi-"
120 toolchain_cpu_arch = "aarch64" 120 toolchain_cpu_arch = "aarch64"
121 } 121 }
122 122
123 android_gcc_toolchain("mips64el") { 123 android_gcc_toolchain("mips64el") {
124 android_ndk_sysroot = "$android_ndk_root/$mips64_android_sysroot_subdir" 124 android_ndk_sysroot = "$android_ndk_root/$mips64_android_sysroot_subdir"
125 android_ndk_lib_dir = "usr/lib" 125 android_ndk_lib_dir = "usr/lib64"
126 126
127 tool_prefix = "$mips64_android_toolchain_root/bin/mipsel-linux-android-" 127 tool_prefix = "$mips64_android_toolchain_root/bin/mipsel-linux-android-"
128 toolchain_cpu_arch = "mipsel64el" 128 toolchain_cpu_arch = "mipsel64el"
129 } 129 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698