Merge "Add cc_*.target.recovery.static_libs" (101b37b9) · Commits · e / os / android_build_soong

cc/linker.go

+5 −0

Original line number	Diff line number	Diff line
		@@ -125,6 +125,10 @@ type BaseLinkerProperties struct {
		// variant of the C/C++ module.
		Shared_libs []string

		// list of static libs that only should be used to build the recovery
		// variant of the C/C++ module.
		Static_libs []string

		// list of shared libs that should not be used to build
		// the recovery variant of the C/C++ module.
		Exclude_shared_libs []string
		@@ -211,6 +215,7 @@ func (linker *baseLinker) linkerDeps(ctx DepsContext, deps Deps) Deps {
		deps.SharedLibs = append(deps.SharedLibs, linker.Properties.Target.Recovery.Shared_libs...)
		deps.SharedLibs = removeListFromList(deps.SharedLibs, linker.Properties.Target.Recovery.Exclude_shared_libs)
		deps.ReexportSharedLibHeaders = removeListFromList(deps.ReexportSharedLibHeaders, linker.Properties.Target.Recovery.Exclude_shared_libs)
		deps.StaticLibs = append(deps.StaticLibs, linker.Properties.Target.Recovery.Static_libs...)
		deps.StaticLibs = removeListFromList(deps.StaticLibs, linker.Properties.Target.Recovery.Exclude_static_libs)
		deps.HeaderLibs = removeListFromList(deps.HeaderLibs, linker.Properties.Target.Recovery.Exclude_header_libs)
		deps.ReexportHeaderLibHeaders = removeListFromList(deps.ReexportHeaderLibHeaders, linker.Properties.Target.Recovery.Exclude_header_libs)