openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Add exclude_shared_libs, expand exclude_static_libs to cover static_libs" am: 7d95aac066 am: 6f77147fde 

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1330296

Change-Id: I652bb18737cc52655628b7d8bfaca39fc23c6d0b
This commit is contained in:
Treehugger Robot 2020-06-11 03:12:49 +00:00 committed by Automerger Merge Worker
parent 639e87e123 6f77147fde
commit 129956fbd4
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cc/linker.go
View File

@ -177,7 +177,10 @@ type BaseLinkerProperties struct {
Version_script *string `android:"path,arch_variant"`
// list of static libs that should not be used to build this module
Exclude_static_libs []string
Exclude_static_libs []string `android:"arch_variant"`
// list of shared libs that should not be used to build this module
Exclude_shared_libs []string `android:"arch_variant"`
}
func NewBaseLinker(sanitize *sanitize) *baseLinker {
@ -223,6 +226,8 @@ func (linker *baseLinker) linkerDeps(ctx DepsContext, deps Deps) Deps {
deps.ReexportSharedLibHeaders = append(deps.ReexportSharedLibHeaders, linker.Properties.Export_shared_lib_headers...)
deps.ReexportGeneratedHeaders = append(deps.ReexportGeneratedHeaders, linker.Properties.Export_generated_headers...)
deps.SharedLibs = removeListFromList(deps.SharedLibs, linker.Properties.Exclude_shared_libs)
deps.StaticLibs = removeListFromList(deps.StaticLibs, linker.Properties.Exclude_static_libs)
deps.WholeStaticLibs = removeListFromList(deps.WholeStaticLibs, linker.Properties.Exclude_static_libs)
if Bool(linker.Properties.Use_version_lib) {