From 6d3db12b8b7d097a1ce6ea2c138698436c17aa4b Mon Sep 17 00:00:00 2001 From: abarth Date: Sat, 18 Jul 2015 14:19:45 -0700 Subject: Only use the .cr.so product extension on Android in the component build This change matches what GYP does. R=brettw@chromium.org Review URL: https://codereview.chromium.org/1237393006 Cr-Commit-Position: refs/heads/master@{#339398} --- build/config/android/config.gni | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'build/config/android/config.gni') diff --git a/build/config/android/config.gni b/build/config/android/config.gni index f11ac41..32ac6d4 100644 --- a/build/config/android/config.gni +++ b/build/config/android/config.gni @@ -171,9 +171,13 @@ 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" + if (component_mode == "shared_library") { + # By appending .cr, we prevent name collisions with libraries already + # loaded by the Android zygote. + android_product_extension = ".cr.so" + } else { + android_product_extension = ".so" + } # ABI ------------------------------------------------------------------------ -- cgit v1.1