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

Unified Diff: mojo/runner/BUILD.gn

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 | « mojo/public/mojo_application.gni ('k') | mojo/services/network/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/runner/BUILD.gn
diff --git a/mojo/runner/BUILD.gn b/mojo/runner/BUILD.gn
index 9f1136ee0d90790842df64b3968587dcf8dec5c7..47df1256a7619076a55bf630cd92ae0295415445 100644
--- a/mojo/runner/BUILD.gn
+++ b/mojo/runner/BUILD.gn
@@ -289,7 +289,7 @@ if (is_android) {
"//mojo/services/network",
]
sources = [
- "$root_out_dir/lib.stripped/libbootstrap.so",
+ "$root_out_dir/lib.stripped/libbootstrap$android_product_extension",
"$root_out_dir/obj/mojo/runner/bootstrap_java.dex.jar",
]
@@ -310,7 +310,7 @@ if (is_android) {
"$root_out_dir/exe.stripped/mojo_runner",
]
outputs = [
- "$root_out_dir/lib.stripped/libmojo_runner.so",
+ "$root_out_dir/lib.stripped/libmojo_runner$android_product_extension",
]
deps = [
":mojo_runner",
@@ -338,7 +338,7 @@ if (is_android) {
android_manifest = "android/apk/AndroidManifest.xml"
- native_libs = [ "libmojo_runner.so" ]
+ native_libs = [ "libmojo_runner$android_product_extension" ]
asset_location = mojo_runner_assets_dir
« no previous file with comments | « mojo/public/mojo_application.gni ('k') | mojo/services/network/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698