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

Unified Diff: build/toolchain/gcc_toolchain.gni

Issue 1236543004: GN (android): Append ".cr" to component .so's to avoid zygote lib collisions (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@gn16
Patch Set: android_shared_library_extension -> android_product_extension (to match GYP) 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 | « build/toolchain/android/BUILD.gn ('k') | components/resource_provider/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/toolchain/gcc_toolchain.gni
diff --git a/build/toolchain/gcc_toolchain.gni b/build/toolchain/gcc_toolchain.gni
index 31c505c40ff454831f30edcb9a48a23172930a7a..3421a9575bda75ed497f57cf2ec3b7e8b3587123 100644
--- a/build/toolchain/gcc_toolchain.gni
+++ b/build/toolchain/gcc_toolchain.gni
@@ -160,6 +160,9 @@ template("gcc_toolchain") {
# overrides it (in which case {{output_extension}} will be what the target
# specifies).
default_output_extension = ".so"
+ if (defined(invoker.default_output_extension)) {
+ default_output_extension = invoker.default_output_extension
+ }
output_prefix = "lib"
« no previous file with comments | « build/toolchain/android/BUILD.gn ('k') | components/resource_provider/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698