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

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

Issue 2931283002: android: Attempt to fix ARMv6 cronet build with clang. (Closed)
Patch Set: Created 3 years, 6 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 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 132 matching lines...) Expand 10 before | Expand all | Expand 10 after
143 } 143 }
144 144
145 # Manually link the libgcc.a that the cross compiler uses. This is 145 # Manually link the libgcc.a that the cross compiler uses. This is
146 # absolute because the linker will look inside the sysroot if it's not. 146 # absolute because the linker will look inside the sysroot if it's not.
147 libs += [ 147 libs += [
148 rebase_path(android_libgcc_file), 148 rebase_path(android_libgcc_file),
149 "c", 149 "c",
150 ] 150 ]
151 151
152 # Clang with libc++ does not require an explicit atomic library reference. 152 # Clang with libc++ does not require an explicit atomic library reference.
153 if (!is_clang) { 153 if (!is_clang || (current_cpu == "arm" && arm_version == 6)) {
154 libs += [ "atomic" ] 154 libs += [ "atomic" ]
155 } 155 }
156 156
157 if (is_clang) { 157 if (is_clang) {
158 # Work around incompatibilities between bionic and clang headers. 158 # Work around incompatibilities between bionic and clang headers.
159 defines += [ 159 defines += [
160 "__compiler_offsetof=__builtin_offsetof", 160 "__compiler_offsetof=__builtin_offsetof",
161 "nan=__builtin_nan", 161 "nan=__builtin_nan",
162 ] 162 ]
163 163
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
228 228
229 # Avoid errors with current NDK: 229 # Avoid errors with current NDK:
230 # "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" 230 # "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"
231 "-finstrument-functions-exclude-file-list=arm_neon.h", 231 "-finstrument-functions-exclude-file-list=arm_neon.h",
232 ] 232 ]
233 } 233 }
234 } 234 }
235 235
236 config("no_cygprofile_instrumentation") { 236 config("no_cygprofile_instrumentation") {
237 } 237 }
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