diff options
| author | agrieve <agrieve@chromium.org> | 2015-07-13 18:30:42 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-07-14 01:31:15 +0000 |
| commit | a2daf08ffddf4549160f3925383b457a2eb03c7f (patch) | |
| tree | 5cc26a1f9d9f643262eac6f317987ebdb3c4e7b5 /mandoline | |
| parent | 83d93adaf16536e9520d0af31f0d1d872bb0a65f (diff) | |
| download | chromium_src-a2daf08ffddf4549160f3925383b457a2eb03c7f.zip chromium_src-a2daf08ffddf4549160f3925383b457a2eb03c7f.tar.gz chromium_src-a2daf08ffddf4549160f3925383b457a2eb03c7f.tar.bz2 | |
GN (android): Append ".cr" to component .so's to avoid zygote lib collisions
With this, ChromePublic now launches with is_component_build = true
BUG=500882
Review URL: https://codereview.chromium.org/1236543004
Cr-Commit-Position: refs/heads/master@{#338612}
Diffstat (limited to 'mandoline')
| -rw-r--r-- | mandoline/app/android/BUILD.gn | 6 | ||||
| -rw-r--r-- | mandoline/services/updater/BUILD.gn | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/mandoline/app/android/BUILD.gn b/mandoline/app/android/BUILD.gn index 2643363..8b7f938 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 diff --git a/mandoline/services/updater/BUILD.gn b/mandoline/services/updater/BUILD.gn index 903c156..2415b84 100644 --- a/mandoline/services/updater/BUILD.gn +++ b/mandoline/services/updater/BUILD.gn @@ -2,7 +2,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import("//third_party/mojo/src/mojo/public/mojo_application.gni") +import("//mojo/public/mojo_application.gni") import("//third_party/mojo/src/mojo/public/tools/bindings/mojom.gni") mojo_native_application("updater") { |