diff options
| author | Hidehiko Abe <hidehiko@chromium.org> | 2019-01-15 01:32:39 +0900 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2019-01-15 02:54:48 -0800 |
| commit | e1f598f7891edd36a940793b4344e9c08af0f2c1 (patch) | |
| tree | d9d30992f1235260ccd6ac94693f19168e8e49b6 /BUILD.gn | |
| parent | 780c6a9c0783e0a96830c563ab31ece48eba2374 (diff) | |
| download | platform_external_libchrome-e1f598f7891edd36a940793b4344e9c08af0f2c1.tar.gz platform_external_libchrome-e1f598f7891edd36a940793b4344e9c08af0f2c1.tar.bz2 platform_external_libchrome-e1f598f7891edd36a940793b4344e9c08af0f2c1.zip | |
libchrome: Annotate "-l" for libs and libs_private.
To support other .pc file generation,
"-l" prepending is moved out from generate-pc.py.
BUG=chromium:913871
TEST=Build.
Change-Id: I8bfbc480edc23ebe71c6374162e807d173b31ac9
Reviewed-on: https://chromium-review.googlesource.com/1409623
Commit-Ready: Hidehiko Abe <hidehiko@chromium.org>
Tested-by: Hidehiko Abe <hidehiko@chromium.org>
Reviewed-by: Shuhei Takahashi <nya@chromium.org>
Diffstat (limited to 'BUILD.gn')
| -rw-r--r-- | BUILD.gn | 26 |
1 files changed, 12 insertions, 14 deletions
@@ -469,16 +469,16 @@ generate_pkg_config("libchrome") { requires_private += attr.pkg_deps } } - libs = [ "base-${libbase_ver}" ] + libs = [ "-lbase-${libbase_ver}" ] libs_private = [] foreach(attr, libbase_sublibs) { if (!defined(attr.testonly) || !attr.testonly) { - libs_private += [ attr.output_name ] - } - } - foreach(attr, libbase_sublibs) { - if ((!defined(attr.testonly) || !attr.testonly) && defined(attr.libs)) { - libs_private += attr.libs + libs_private += [ "-l" + attr.output_name ] + if (defined(attr.libs)) { + foreach(lib, attr.libs) { + libs_private += [ "-l" + lib ] + } + } } } cflags = libchrome_exported_cflags @@ -516,16 +516,14 @@ generate_pkg_config("libchrome-test") { requires_private += attr.pkg_deps } } - libs = [ "base-test-${libbase_ver}" ] + libs = [ "-lbase-test-${libbase_ver}" ] libs_private = [] foreach(attr, libbase_sublibs) { if (defined(attr.testonly) && attr.testonly) { - libs_private += [ attr.output_name ] - } - } - foreach(attr, libbase_sublibs) { - if (defined(attr.testonly) && attr.testonly && defined(attr.libs)) { - libs_private += attr.libs + libs_private += [ "-l" + attr.output_name ] + if (defined(attr.libs)) { + libs_private += [ "-l" + lib ] + } } } cflags = libchrome_exported_cflags |