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

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

Issue 1473273002: GN(Android): Add libosmesa.so to ContentShell.apk (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: comments Created 5 years 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 | « build/config/android/rules.gni ('k') | build/toolchain/gcc_toolchain.gni » ('j') | 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/gcc_toolchain.gni") 6 import("//build/toolchain/gcc_toolchain.gni")
7 7
8 # The Android GCC toolchains share most of the same parameters, so we have this 8 # The Android GCC toolchains share most of the same parameters, so we have this
9 # wrapper around gcc_toolchain to avoid duplication of logic. 9 # wrapper around gcc_toolchain to avoid duplication of logic.
10 # 10 #
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 } else { 42 } else {
43 cc = "${tool_prefix}gcc" 43 cc = "${tool_prefix}gcc"
44 cxx = "${tool_prefix}g++" 44 cxx = "${tool_prefix}g++"
45 } 45 }
46 ar = tool_prefix + "ar" 46 ar = tool_prefix + "ar"
47 ld = cxx 47 ld = cxx
48 readelf = tool_prefix + "readelf" 48 readelf = tool_prefix + "readelf"
49 nm = tool_prefix + "nm" 49 nm = tool_prefix + "nm"
50 strip = "${tool_prefix}strip" 50 strip = "${tool_prefix}strip"
51 51
52 # Don't use .cr.so for loadable_modules since they are always loaded via
53 # absolute path.
54 loadable_module_extension = ".so"
55
52 toolchain_os = "android" 56 toolchain_os = "android"
53 toolchain_cpu = invoker.toolchain_cpu 57 toolchain_cpu = invoker.toolchain_cpu
54 } 58 }
55 } 59 }
56 60
57 template("android_gcc_toolchains_helper") { 61 template("android_gcc_toolchains_helper") {
58 android_gcc_toolchain(target_name) { 62 android_gcc_toolchain(target_name) {
59 android_ndk_sysroot = invoker.android_ndk_sysroot 63 android_ndk_sysroot = invoker.android_ndk_sysroot
60 android_ndk_lib_dir = invoker.android_ndk_lib_dir 64 android_ndk_lib_dir = invoker.android_ndk_lib_dir
61 tool_prefix = invoker.tool_prefix 65 tool_prefix = invoker.tool_prefix
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
111 toolchain_cpu = "aarch64" 115 toolchain_cpu = "aarch64"
112 } 116 }
113 117
114 android_gcc_toolchains_helper("mips64el") { 118 android_gcc_toolchains_helper("mips64el") {
115 android_ndk_sysroot = "$android_ndk_root/$mips64_android_sysroot_subdir" 119 android_ndk_sysroot = "$android_ndk_root/$mips64_android_sysroot_subdir"
116 android_ndk_lib_dir = "usr/lib64" 120 android_ndk_lib_dir = "usr/lib64"
117 121
118 tool_prefix = "$mips64_android_toolchain_root/bin/mipsel-linux-android-" 122 tool_prefix = "$mips64_android_toolchain_root/bin/mipsel-linux-android-"
119 toolchain_cpu = "mipsel64el" 123 toolchain_cpu = "mipsel64el"
120 } 124 }
OLDNEW
« no previous file with comments | « build/config/android/rules.gni ('k') | build/toolchain/gcc_toolchain.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698