Mixed builds: propagate includes from cc_* targets

This allows us to remove libasync_safe from the mixed builds denylist. Test: mixed_libc.sh CI script Change-Id: Ibafd231284864078bf30340f919d39e5098843ce
2021-04-27 14:48:30 -04:00
parent 8fb66f48c7
commit f60ecf081e
3 changed files with 18 additions and 10 deletions
--- a/cc/linkable.go
+++ b/cc/linkable.go
@@ -283,7 +283,7 @@ func flagExporterInfoFromCcInfo(ctx android.ModuleContext, ccInfo cquery.CcInfo)
 	systemIncludes := android.PathsForBazelOut(ctx, ccInfo.SystemIncludes)

 	return FlagExporterInfo{
-		IncludeDirs:       includes,
-		SystemIncludeDirs: systemIncludes,
+		IncludeDirs:       android.FirstUniquePaths(includes),
+		SystemIncludeDirs: android.FirstUniquePaths(systemIncludes),
 	}
 }