commit f42daa716cd52404db6d23c62b93a23e6309b42a
author Steven Moreland <smoreland@google.com> Fri Apr 02 16:03:59 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Apr 02 16:03:59 2021 +0000
tree a237af4a57e87fb03ad0e91e3ab645b1f2df8803
parent d0afefa4b18585ed07f03c9ff1e3313b67bfb25a
parent ba407c8afaab20aa1c4688eb050e6524c3f668b2

Merge "Export header check allows WholeStaticLibs"

cc/cc.go

diff --git a/cc/cc.go b/cc/cc.go
index f074597..bef89fa 100644
--- a/cc/cc.go
+++ b/cc/cc.go
@@ -1892,8 +1892,8 @@
 	}
 
 	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)
 		}
 	}