Propagate headers from bazel to mixed builds

Bug: 208503274
Test: mixed_libc.sh
Change-Id: I0be57f2a22f48be3a919208db4034d2bd03c18c0
This commit is contained in:
Liz Kammer
2021-12-06 14:56:25 -05:00
parent b0d167cb43
commit eb2d6d1ffd
5 changed files with 37 additions and 18 deletions

View File

@@ -384,9 +384,13 @@ func flagExporterInfoFromCcInfo(ctx android.ModuleContext, ccInfo cquery.CcInfo)
includes := android.PathsForBazelOut(ctx, ccInfo.Includes)
systemIncludes := android.PathsForBazelOut(ctx, ccInfo.SystemIncludes)
headers := android.PathsForBazelOut(ctx, ccInfo.Headers)
return FlagExporterInfo{
IncludeDirs: android.FirstUniquePaths(includes),
SystemIncludeDirs: android.FirstUniquePaths(systemIncludes),
GeneratedHeaders: headers,
// necessary to ensure generated headers are considered implicit deps of dependent actions
Deps: headers,
}
}