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

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

Issue 2193943002: [Android] Roll to NDK r12b. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: No more -lc++ & update host gdb client path. Created 4 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 unified diff | Download patch
« no previous file with comments | « build/android/adb_gdb ('k') | build/config/android/config.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 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 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/android/config.gni") 5 import("//build/config/android/config.gni")
6 import("//build/config/sanitizers/sanitizers.gni") 6 import("//build/config/sanitizers/sanitizers.gni")
7 7
8 assert(is_android) 8 assert(is_android)
9 9
10 # This is included by reference in the //build/config/compiler config that 10 # This is included by reference in the //build/config/compiler config that
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
114 lib_dirs = [ android_libcpp_lib_dir ] 114 lib_dirs = [ android_libcpp_lib_dir ]
115 115
116 # The libc++ runtime library (must come first). 116 # The libc++ runtime library (must come first).
117 # ASan needs to dynamically link to libc++ even in static builds so 117 # ASan needs to dynamically link to libc++ even in static builds so
118 # that it can interpose operator new. 118 # that it can interpose operator new.
119 if (is_component_build || is_asan) { 119 if (is_component_build || is_asan) {
120 libs = [ "c++_shared" ] 120 libs = [ "c++_shared" ]
121 } else { 121 } else {
122 libs = [ "c++_static" ] 122 libs = [ "c++_static" ]
123 } 123 }
124 libs += [
jbudorick 2016/09/03 18:41:01 ... and because -lc++ didn't work, I had to specif
125 "c++abi",
126 "android_support",
127 "unwind",
128 "atomic",
129 ]
124 130
125 # Manually link the libgcc.a that the cross compiler uses. This is 131 # Manually link the libgcc.a that the cross compiler uses. This is
126 # absolute because the linker will look inside the sysroot if it's not. 132 # absolute because the linker will look inside the sysroot if it's not.
127 libs += [ 133 libs += [
128 rebase_path(android_libgcc_file), 134 rebase_path(android_libgcc_file),
129 "c", 135 "c",
130 ] 136 ]
131 137
132 # Clang with libc++ does not require an explicit atomic library reference. 138 # Clang with libc++ does not require an explicit atomic library reference.
133 if (!is_clang) { 139 if (!is_clang) {
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
188 194
189 # Avoid errors with current NDK: 195 # Avoid errors with current NDK:
190 # "third_party/android_tools/ndk/toolchains/arm-linux-androideabi-4.6/preb uilt/linux-x86_64/bin/../lib/gcc/arm-linux-androideabi/4.6/include/arm_neon.h:34 26:3: error: argument must be a constant" 196 # "third_party/android_tools/ndk/toolchains/arm-linux-androideabi-4.6/preb uilt/linux-x86_64/bin/../lib/gcc/arm-linux-androideabi/4.6/include/arm_neon.h:34 26:3: error: argument must be a constant"
191 "-finstrument-functions-exclude-file-list=arm_neon.h", 197 "-finstrument-functions-exclude-file-list=arm_neon.h",
192 ] 198 ]
193 } 199 }
194 } 200 }
195 201
196 config("no_cygprofile_instrumentation") { 202 config("no_cygprofile_instrumentation") {
197 } 203 }
OLDNEW
« no previous file with comments | « build/android/adb_gdb ('k') | build/config/android/config.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698