tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Avoid race condition over ExportedSystemIncludeDirs" am: 670ed3d97d am: a3cba8ecd9

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

Change-Id: I04f45a0afb4c3b58504da3964b8df96addc0be8c
This commit is contained in:
Treehugger Robot 2020-06-25 08:14:00 +00:00 committed by Automerger Merge Worker
commit 73672049ff
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
cc/library_sdk_member.go
View file

@ -380,7 +380,11 @@ func (p *nativeLibInfoProperties) PopulateFromVariant(ctx android.SdkMemberConte
// Make sure that the include directories are unique.
p.ExportedIncludeDirs = android.FirstUniquePaths(exportedIncludeDirs)
p.exportedGeneratedIncludeDirs = android.FirstUniquePaths(exportedGeneratedIncludeDirs)
p.ExportedSystemIncludeDirs = android.FirstUniquePaths(ccModule.ExportedSystemIncludeDirs())
// Take a copy before filtering out duplicates to avoid changing the slice owned by the
// ccModule.
dirs := append(android.Paths(nil), ccModule.ExportedSystemIncludeDirs()...)
p.ExportedSystemIncludeDirs = android.FirstUniquePaths(dirs)
p.ExportedFlags = ccModule.ExportedFlags()
if ccModule.linker != nil {