diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2017-08-10 01:35:02 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-08-10 01:35:02 +0000 |
| commit | 88e6f14a6bcc1e755809b07d0a919443fb32a41c (patch) | |
| tree | 73b146ab7c97eb735cfabb22ac3385d2fcc808e8 | |
| parent | bbf2d25cb73dde6c7be400a6e0ddb9027ed2389e (diff) | |
| parent | ef34632af34ef8bc9b65b2588360e5ad206a3d0b (diff) | |
| download | build_soong-88e6f14a6bcc1e755809b07d0a919443fb32a41c.tar.gz build_soong-88e6f14a6bcc1e755809b07d0a919443fb32a41c.tar.bz2 build_soong-88e6f14a6bcc1e755809b07d0a919443fb32a41c.zip | |
Merge "a shared lib header is not exported to vendors if it is in exclude_shared_libs" into oc-mr1-dev
| -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") } |