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

Unified Diff: mojo/public/mojo_application.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 | « mandoline/services/updater/BUILD.gn ('k') | mojo/runner/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/public/mojo_application.gni
diff --git a/mojo/public/mojo_application.gni b/mojo/public/mojo_application.gni
index 1450227fe287c494edaee961ccfb6e9e76719b95..c5cac1982261d9640b65528538787e4b0acdb4c6 100644
--- a/mojo/public/mojo_application.gni
+++ b/mojo/public/mojo_application.gni
@@ -3,6 +3,9 @@
# found in the LICENSE file.
import("mojo.gni")
+if (is_android) {
+ import("//build/config/android/config.gni")
+}
# Generate a binary Mojo application in a self-named directory.
# Application resources are copied to a "resources" directory alongside the app.
@@ -39,8 +42,10 @@ template("mojo_native_application") {
output = base_target_name + ".mojo"
library_target_name = base_target_name + "_library"
- if (is_linux || is_android) {
+ if (is_linux) {
library_name = "lib${library_target_name}.so"
+ } else if (is_android) {
+ library_name = "lib${library_target_name}${android_product_extension}"
} else if (is_win) {
library_name = "${library_target_name}.dll"
} else if (is_mac) {
« no previous file with comments | « mandoline/services/updater/BUILD.gn ('k') | mojo/runner/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698