Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 82f62fda authored by Victor Khimenko's avatar Victor Khimenko Committed by Android (Google) Code Review
Browse files

Merge "Add exclude_shared_libs, expand exclude_static_libs to cover static_libs" into rvc-dev

parents 16e8b049 1429cdcf

cc/linker.go

+6 −1
Original line number Diff line number Diff line
@@ -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) {