Dedup include dir paths
Remove duplicates from include dir paths before setting
FlagExporterInfoProvider. Duplicates often occur, for example due to
inheriting export_include_dirs from the static variant of a library to
the shared variant of the library that also gets the same
export_include_dirs.
Test: m checkbuild
Change-Id: I71f9e841547db64cbabcd95288ee93ef21fab4fb
diff --git a/cc/library.go b/cc/library.go
index 2b0ee46..618825f 100644
--- a/cc/library.go
+++ b/cc/library.go
@@ -404,8 +404,8 @@
func (f *flagExporter) setProvider(ctx android.ModuleContext) {
ctx.SetProvider(FlagExporterInfoProvider, FlagExporterInfo{
- IncludeDirs: f.dirs,
- SystemIncludeDirs: f.systemDirs,
+ IncludeDirs: android.FirstUniquePaths(f.dirs),
+ SystemIncludeDirs: android.FirstUniquePaths(f.systemDirs),
Flags: f.flags,
Deps: f.deps,
GeneratedHeaders: f.headers,