diff options
| author | agrieve <agrieve@chromium.org> | 2015-08-10 14:17:56 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-08-10 21:18:34 +0000 |
| commit | c3cd5e6fe977af4a3c8b20ccb332896b2c888354 (patch) | |
| tree | 4dccc3417f4063399d257b90cf48b1d892e100ec /mojo/services | |
| parent | a5fa5e73f767269040ba6ebf29fd42fdfe62d8ee (diff) | |
| download | chromium_src-c3cd5e6fe977af4a3c8b20ccb332896b2c888354.zip chromium_src-c3cd5e6fe977af4a3c8b20ccb332896b2c888354.tar.gz chromium_src-c3cd5e6fe977af4a3c8b20ccb332896b2c888354.tar.bz2 | |
GN: Use lib.unstripped rather than lib.stripped. Add a toolchain.gni
toolchain.gni introduces:
root_shlib_dir, shlib_prefix, and shlib_extension
The original goal of this change was to put shlibs under lib/ for Linux / Android, since that's where GYP puts them. However, the lack of support for loadable_module (or more specifically - per target output directory) in GN makes this infeasible at the moment.
This change also mitigates a subtle bug where on Android the unstripped .so is used mistakenly instead of the lib.stripped/ version. It also fixes shlib's link_output being set to the unstripped .so rather than the stripped .so (on Android).
BUG=509771
Review URL: https://codereview.chromium.org/1236503002
Cr-Commit-Position: refs/heads/master@{#342697}
Diffstat (limited to 'mojo/services')
| -rw-r--r-- | mojo/services/network/BUILD.gn | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mojo/services/network/BUILD.gn b/mojo/services/network/BUILD.gn index e01a567..86893a9 100644 --- a/mojo/services/network/BUILD.gn +++ b/mojo/services/network/BUILD.gn @@ -11,7 +11,7 @@ if (is_android) { mojo_android_application("network") { output_name = "network_service" - input_so = "$root_out_dir/lib.stripped/libnetwork_service$android_product_extension" + input_so = "$root_shlib_dir/${shlib_prefix}network_service$shlib_extension" input_dex_jar = java_library_path deps = [ ":java_library", |