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

Unified 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: 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/config/android/BUILD.gn
diff --git a/build/config/android/BUILD.gn b/build/config/android/BUILD.gn
index 0503bef1e1f3edd4ef79313dbbb37deeab1d87d5..ac9a7ed928445f7d3cf0e09cdd9949d09dd78e49 100644
--- a/build/config/android/BUILD.gn
+++ b/build/config/android/BUILD.gn
@@ -143,22 +143,22 @@ config("runtime_library") {
root_build_dir),
]
+ # The libc++ runtime library.
+ _libcpp = "c++_static"
+ if (is_component_build) {
+ _libcpp = "c++_shared"
+ }
+
defines = [ "__GNU_SOURCE=1" ] # Necessary for clone().
ldflags = [ "-nostdlib" ]
lib_dirs = [ "$android_libcpp_root/libs/$android_app_abi" ]
libs = [
brettw 2015/10/02 18:13:16 I'd prefer to have this as if (is_com...) { # C+
agrieve 2015/10/02 18:16:38 Done.
+ _libcpp, # Must come first.
"c",
"dl",
"m",
]
- # The libc++ runtime library.
- if (is_component_build) {
- libs += [ "c++_shared" ]
- } else {
- libs += [ "c++_static" ]
- }
-
if (is_clang) {
# Work around incompatibilities between bionic and clang headers.
defines += [
« 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