diff options
| author | abarth <abarth@chromium.org> | 2015-07-18 14:19:45 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-07-18 21:20:21 +0000 |
| commit | 6d3db12b8b7d097a1ce6ea2c138698436c17aa4b (patch) | |
| tree | 9dac4529d1b8f65c723997e70b6f9ac4746ebf03 /build/config/android/config.gni | |
| parent | 955ce18d6120e849d8dde66c1c1562bc3a0d207c (diff) | |
| download | chromium_src-6d3db12b8b7d097a1ce6ea2c138698436c17aa4b.zip chromium_src-6d3db12b8b7d097a1ce6ea2c138698436c17aa4b.tar.gz chromium_src-6d3db12b8b7d097a1ce6ea2c138698436c17aa4b.tar.bz2 | |
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}
Diffstat (limited to 'build/config/android/config.gni')
| -rw-r--r-- | build/config/android/config.gni | 10 |
1 files changed, 7 insertions, 3 deletions
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 ------------------------------------------------------------------------ |