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

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

Issue 1384673004: GN: Fix Chrome crashing on start-up (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: formatting Created 5 years, 2 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 import("//build/config/sysroot.gni") 7 import("//build/config/sysroot.gni")
8 8
9 assert(is_android) 9 assert(is_android)
10 10
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
139 "$android_ndk_root/sources/cxx-stl/llvm-libc++abi/libcxxabi/include" , 139 "$android_ndk_root/sources/cxx-stl/llvm-libc++abi/libcxxabi/include" ,
140 root_build_dir), 140 root_build_dir),
141 "-isystem" + 141 "-isystem" +
142 rebase_path("$android_ndk_root/sources/android/support/include", 142 rebase_path("$android_ndk_root/sources/android/support/include",
143 root_build_dir), 143 root_build_dir),
144 ] 144 ]
145 145
146 defines = [ "__GNU_SOURCE=1" ] # Necessary for clone(). 146 defines = [ "__GNU_SOURCE=1" ] # Necessary for clone().
147 ldflags = [ "-nostdlib" ] 147 ldflags = [ "-nostdlib" ]
148 lib_dirs = [ "$android_libcpp_root/libs/$android_app_abi" ] 148 lib_dirs = [ "$android_libcpp_root/libs/$android_app_abi" ]
149 libs = [ 149
150 # The libc++ runtime library (must come first).
151 if (is_component_build) {
152 libs = [ "c++_shared" ]
153 } else {
154 libs = [ "c++_static" ]
155 }
156 libs += [
150 "c", 157 "c",
151 "dl", 158 "dl",
152 "m", 159 "m",
153 ] 160 ]
154 161
155 # The libc++ runtime library.
156 if (is_component_build) {
157 libs += [ "c++_shared" ]
158 } else {
159 libs += [ "c++_static" ]
160 }
161
162 if (is_clang) { 162 if (is_clang) {
163 # Work around incompatibilities between bionic and clang headers. 163 # Work around incompatibilities between bionic and clang headers.
164 defines += [ 164 defines += [
165 "__compiler_offsetof=__builtin_offsetof", 165 "__compiler_offsetof=__builtin_offsetof",
166 "nan=__builtin_nan", 166 "nan=__builtin_nan",
167 ] 167 ]
168 } 168 }
169 169
170 # TODO(jdduke) Re-enable on mips after resolving linking 170 # TODO(jdduke) Re-enable on mips after resolving linking
171 # issues with libc++ (crbug.com/456380). 171 # issues with libc++ (crbug.com/456380).
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
249 249
250 # Avoid errors with current NDK: 250 # Avoid errors with current NDK:
251 # "third_party/android_tools/ndk/toolchains/arm-linux-androideabi-4.6/prebui lt/linux-x86_64/bin/../lib/gcc/arm-linux-androideabi/4.6/include/arm_neon.h:3426 :3: error: argument must be a constant" 251 # "third_party/android_tools/ndk/toolchains/arm-linux-androideabi-4.6/prebui lt/linux-x86_64/bin/../lib/gcc/arm-linux-androideabi/4.6/include/arm_neon.h:3426 :3: error: argument must be a constant"
252 "-finstrument-functions-exclude-file-list=arm_neon.h,SaturatedArithmeticARM. h", 252 "-finstrument-functions-exclude-file-list=arm_neon.h,SaturatedArithmeticARM. h",
253 ] 253 ]
254 defines = [ "CYGPROFILE_INSTRUMENTATION=1" ] 254 defines = [ "CYGPROFILE_INSTRUMENTATION=1" ]
255 } 255 }
256 256
257 config("no_cygprofile_instrumentation") { 257 config("no_cygprofile_instrumentation") {
258 } 258 }
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