openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Export header check allows WholeStaticLibs" am: f42daa716c am: 3f34589233 am: ed06f3b55e 

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

Change-Id: I74ff6ad6a2b4aaff4fb1e01dcd896a9b543c8a76
This commit is contained in:
Steven Moreland 2021-04-02 17:37:44 +00:00 committed by Automerger Merge Worker
parent 89624d7866 ed06f3b55e
commit 889dc32103
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cc/cc.go
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)
}
}