Merge "Export header check allows WholeStaticLibs" am: f42daa716c

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

Change-Id: I701cd70f484d45c3e5755e56692b8cd4ddf3d8a2
This commit is contained in:
Steven Moreland
2021-04-02 16:58:12 +00:00
committed by Automerger Merge Worker

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)
}
}