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

Unified Diff: build/config/android/config.gni

Issue 1237393006: Only use the .cr.so product extension on Android in the component build (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 5 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/config.gni
diff --git a/build/config/android/config.gni b/build/config/android/config.gni
index f11ac41b62f203a4c7e57459730810556bb2d0a2..32ac6d4c328c9a2d734046ae094625f321175ddc 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 ------------------------------------------------------------------------
« 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