Merge "Add static_libs field to target.vendor" am: 5c50e7f7c4 am: f789eab3c5 am: dc7dc18251 (7e83a01a) · Commits · e / os / android_build_soong

cc/linker.go

+5 −0

Original line number	Diff line number	Diff line
		@@ -101,6 +101,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 vendor
		// variant of the C/C++ module.
		Static_libs []string

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