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

Unified Diff: mandoline/app/android/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 | « components/resource_provider/BUILD.gn ('k') | mandoline/services/updater/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mandoline/app/android/BUILD.gn
diff --git a/mandoline/app/android/BUILD.gn b/mandoline/app/android/BUILD.gn
index 2643363cf9da3cbb87ef0e64d695fe0cf0829239..8b7f9382ad1b57ac3f81114c61040d176ee09333 100644
--- a/mandoline/app/android/BUILD.gn
+++ b/mandoline/app/android/BUILD.gn
@@ -44,7 +44,7 @@ copy("copy_mandoline_runner") {
"$root_out_dir/exe.stripped/mandoline_runner",
]
outputs = [
- "$root_out_dir/lib.stripped/libmandoline_runner.so",
+ "$root_out_dir/lib.stripped/libmandoline_runner$android_product_extension",
]
}
@@ -61,7 +61,7 @@ copy_ex("copy_mandoline_assets") {
"//mojo/runner:bootstrap_java",
]
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",
]
@@ -120,7 +120,7 @@ android_apk("mandoline_apk") {
android_manifest = "apk/AndroidManifest.xml"
- native_libs = [ "libmandoline_runner.so" ]
+ native_libs = [ "libmandoline_runner$android_product_extension" ]
asset_location = mandoline_assets_dir
« no previous file with comments | « components/resource_provider/BUILD.gn ('k') | mandoline/services/updater/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698