Export header check allows WholeStaticLibs

cc/linker.go code assumes that export_static_lib_headers can apply
regardless of whether a library is a regular or 'whole' static lib.
However, this check prevents that code from working.

Bug: 183654927
Test: use export_static_lib_headers like this
Change-Id: I680f90514e41224a7077630167ab4e481909d89c
This commit is contained in:
Steven Moreland 2021-04-01 22:17:50 +00:00
parent e6165d0f46
commit ba407c8afa
1 changed files with 2 additions and 2 deletions

View File

@ -1892,8 +1892,8 @@ func (c *Module) deps(ctx DepsContext) Deps {
}
for _, lib := range deps.ReexportStaticLibHeaders {
if !inList(lib, deps.StaticLibs) {
ctx.PropertyErrorf("export_static_lib_headers", "Static library not in static_libs: '%s'", lib)
if !inList(lib, deps.StaticLibs) && !inList(lib, deps.WholeStaticLibs) {
ctx.PropertyErrorf("export_static_lib_headers", "Static library not in static_libs or whole_static_libs: '%s'", lib)
}
}