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

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

Issue 1865853002: Add android_libcpp_lib_dir gn arg (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: use a single variable Created 4 years, 8 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/BUILD.gn ('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 import("//build/config/sysroot.gni") 7 import("//build/config/sysroot.gni")
8 8
9 assert(is_android) 9 assert(is_android)
10 10
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after
136 "-isystem" + rebase_path( 136 "-isystem" + rebase_path(
137 "$android_ndk_root/sources/cxx-stl/llvm-libc++abi/libcxxabi/include" , 137 "$android_ndk_root/sources/cxx-stl/llvm-libc++abi/libcxxabi/include" ,
138 root_build_dir), 138 root_build_dir),
139 "-isystem" + 139 "-isystem" +
140 rebase_path("$android_ndk_root/sources/android/support/include", 140 rebase_path("$android_ndk_root/sources/android/support/include",
141 root_build_dir), 141 root_build_dir),
142 ] 142 ]
143 143
144 defines = [ "__GNU_SOURCE=1" ] # Necessary for clone(). 144 defines = [ "__GNU_SOURCE=1" ] # Necessary for clone().
145 ldflags = [ "-nostdlib" ] 145 ldflags = [ "-nostdlib" ]
146 lib_dirs = [ "$android_libcpp_root/libs/$android_app_abi" ] 146 lib_dirs = [ android_libcpp_lib_dir ]
147 147
148 # The libc++ runtime library (must come first). 148 # The libc++ runtime library (must come first).
149 # ASan needs to dynamically link to libc++ even in static builds so 149 # ASan needs to dynamically link to libc++ even in static builds so
150 # that it can interpose operator new. 150 # that it can interpose operator new.
151 if (is_component_build || is_asan) { 151 if (is_component_build || is_asan) {
152 libs = [ "c++_shared" ] 152 libs = [ "c++_shared" ]
153 } else { 153 } else {
154 libs = [ "c++_static" ] 154 libs = [ "c++_static" ]
155 } 155 }
156 156
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
220 220
221 # Avoid errors with current NDK: 221 # Avoid errors with current NDK:
222 # "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" 222 # "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"
223 "-finstrument-functions-exclude-file-list=arm_neon.h", 223 "-finstrument-functions-exclude-file-list=arm_neon.h",
224 ] 224 ]
225 } 225 }
226 } 226 }
227 227
228 config("no_cygprofile_instrumentation") { 228 config("no_cygprofile_instrumentation") {
229 } 229 }
OLDNEW
« no previous file with comments | « build/android/BUILD.gn ('k') | build/config/android/config.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698