diff options
| author | Jiyong Park <jiyong@google.com> | 2017-08-10 00:48:06 +0900 |
|---|---|---|
| committer | Jiyong Park <jiyong@google.com> | 2017-08-10 00:54:30 +0900 |
| commit | ef34632af34ef8bc9b65b2588360e5ad206a3d0b (patch) | |
| tree | 9fdf413ef8d183b6be45e6b367bdc5578d23f13d | |
| parent | 7ec6cb270bf206ce0af29160b9bb66e6598a8134 (diff) | |
| download | build_soong-ef34632af34ef8bc9b65b2588360e5ad206a3d0b.tar.gz build_soong-ef34632af34ef8bc9b65b2588360e5ad206a3d0b.tar.bz2 build_soong-ef34632af34ef8bc9b65b2588360e5ad206a3d0b.zip | |
a shared lib header is not exported to vendors if it is in exclude_shared_libs
Since a lib in exclude_shared_libs are not used for the vendor variant,
it should also be removed from the export_shared_lib_headers.
Bug: 62471389
Test: BOARD_VNDK_VERSION=current m -j libxml2.vendor successful
(libxml2 has libicuuc in both exported_shared_lib_headers and
exclude_shared_libs for the vendor variant)
Change-Id: Ic9ddbd7be3c76df563e428ba2409a03bd2e1e113
| -rw-r--r-- | cc/linker.go | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/cc/linker.go b/cc/linker.go index 1a842ae2..5250d2d6 100644 --- a/cc/linker.go +++ b/cc/linker.go @@ -131,15 +131,16 @@ func (linker *baseLinker) linkerDeps(ctx BaseModuleContext, deps Deps) Deps { deps.StaticLibs = append(deps.StaticLibs, linker.Properties.Static_libs...) deps.SharedLibs = append(deps.SharedLibs, linker.Properties.Shared_libs...) - if ctx.vndk() { - deps.SharedLibs = removeListFromList(deps.SharedLibs, linker.Properties.Target.Vendor.Exclude_shared_libs) - } - deps.ReexportHeaderLibHeaders = append(deps.ReexportHeaderLibHeaders, linker.Properties.Export_header_lib_headers...) deps.ReexportStaticLibHeaders = append(deps.ReexportStaticLibHeaders, linker.Properties.Export_static_lib_headers...) deps.ReexportSharedLibHeaders = append(deps.ReexportSharedLibHeaders, linker.Properties.Export_shared_lib_headers...) deps.ReexportGeneratedHeaders = append(deps.ReexportGeneratedHeaders, linker.Properties.Export_generated_headers...) + if ctx.vndk() { + deps.SharedLibs = removeListFromList(deps.SharedLibs, linker.Properties.Target.Vendor.Exclude_shared_libs) + deps.ReexportSharedLibHeaders = removeListFromList(deps.ReexportSharedLibHeaders, linker.Properties.Target.Vendor.Exclude_shared_libs) + } + if ctx.ModuleName() != "libcompiler_rt-extras" { deps.LateStaticLibs = append(deps.LateStaticLibs, "libcompiler_rt-extras") } |