Chromium Code Reviews| 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 += [ |