| Index: build/config/android/config.gni
|
| diff --git a/build/config/android/config.gni b/build/config/android/config.gni
|
| index 192a502987ae400540296b41642122164819f60b..f11ac41b62f203a4c7e57459730810556bb2d0a2 100644
|
| --- a/build/config/android/config.gni
|
| +++ b/build/config/android/config.gni
|
| @@ -162,7 +162,7 @@ if (is_android) {
|
| android_gdbserver =
|
| "$android_ndk_root/prebuilt/$android_prebuilt_arch/gdbserver/gdbserver"
|
|
|
| - # libc++ stuff ---------------------------------------------------------------
|
| + # Toolchain stuff ------------------------------------------------------------
|
|
|
| android_libcpp_root = "$android_ndk_root/sources/cxx-stl/llvm-libc++"
|
| if (component_mode == "shared_library") {
|
| @@ -171,6 +171,10 @@ if (is_android) {
|
| android_libcpp_library = "c++_static"
|
| }
|
|
|
| + # By appending .cr, we prevent name collisions with libraries already
|
| + # loaded by the Android zygote.
|
| + android_product_extension = ".cr.so"
|
| +
|
| # ABI ------------------------------------------------------------------------
|
|
|
| if (current_cpu == "x86") {
|
|
|