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

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

Issue 420353002: GN: Specify correct prefix/postfix libs for solink on android (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 4 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | build/toolchain/gcc_toolchain.gni » ('j') | build/toolchain/gcc_toolchain.gni » ('J')
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/clang.gni") 6 import("//build/toolchain/clang.gni")
7 import("//build/toolchain/goma.gni") 7 import("//build/toolchain/goma.gni")
8 import("//build/toolchain/gcc_toolchain.gni") 8 import("//build/toolchain/gcc_toolchain.gni")
9 9
10 # The Android GCC toolchains share most of the same parameters, so we have this 10 # The Android GCC toolchains share most of the same parameters, so we have this
(...skipping 11 matching lines...) Expand all
22 template("android_gcc_toolchain") { 22 template("android_gcc_toolchain") {
23 gcc_toolchain(target_name) { 23 gcc_toolchain(target_name) {
24 # Make our manually injected libs relative to the build dir. 24 # Make our manually injected libs relative to the build dir.
25 android_ndk_lib = rebase_path( 25 android_ndk_lib = rebase_path(
26 invoker.android_ndk_sysroot + "/" + invoker.android_ndk_lib_dir, 26 invoker.android_ndk_sysroot + "/" + invoker.android_ndk_lib_dir,
27 root_build_dir) 27 root_build_dir)
28 28
29 libs_section_prefix = "$android_ndk_lib/crtbegin_dynamic.o" 29 libs_section_prefix = "$android_ndk_lib/crtbegin_dynamic.o"
30 libs_section_postfix = "$android_ndk_lib/crtend_android.o" 30 libs_section_postfix = "$android_ndk_lib/crtend_android.o"
31 31
32 solink_libs_section_prefix = "$android_ndk_lib/crtbegin_so.o"
33 solink_libs_section_postfix = "$android_ndk_lib/crtend_so.o"
34
32 # The tools should be run relative to the build dir. 35 # The tools should be run relative to the build dir.
33 tool_prefix = rebase_path(invoker.tool_prefix, root_build_dir) 36 tool_prefix = rebase_path(invoker.tool_prefix, root_build_dir)
34 37
35 if (use_goma) { 38 if (use_goma) {
36 goma_prefix = "$goma_dir/gomacc " 39 goma_prefix = "$goma_dir/gomacc "
37 } else { 40 } else {
38 goma_prefix = "" 41 goma_prefix = ""
39 } 42 }
40 43
41 cc = goma_prefix + tool_prefix + "gcc" 44 cc = goma_prefix + tool_prefix + "gcc"
(...skipping 22 matching lines...) Expand all
64 toolchain_cpu_arch = "arm" 67 toolchain_cpu_arch = "arm"
65 } 68 }
66 69
67 android_gcc_toolchain("mipsel") { 70 android_gcc_toolchain("mipsel") {
68 android_ndk_sysroot = "$android_ndk_root/$mips_android_sysroot_subdir" 71 android_ndk_sysroot = "$android_ndk_root/$mips_android_sysroot_subdir"
69 android_ndk_lib_dir = "usr/lib" 72 android_ndk_lib_dir = "usr/lib"
70 73
71 tool_prefix = "$mips_android_toolchain_root/bin/mipsel-linux-android-" 74 tool_prefix = "$mips_android_toolchain_root/bin/mipsel-linux-android-"
72 toolchain_cpu_arch = "mipsel" 75 toolchain_cpu_arch = "mipsel"
73 } 76 }
OLDNEW
« no previous file with comments | « no previous file | build/toolchain/gcc_toolchain.gni » ('j') | build/toolchain/gcc_toolchain.gni » ('J')

Powered by Google App Engine
This is Rietveld 408576698