StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove unnecessary dedup logic" am: 719371072f

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

Change-Id: Idb494ba7c00500fac16a1acd562db317bb859326
This commit is contained in:
Paul Duffin
2021-07-21 11:20:49 +00:00
committed by Automerger Merge Worker
parent b4186d80f1 719371072f
commit 916f3b6bb1
2 changed files with 0 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
java/hiddenapi_modular.go
View File

@@ -510,14 +510,6 @@ func (s FlagFilesByCategory) append(other FlagFilesByCategory) {
} }
} }
// dedup removes duplicates in the flag files, while maintaining the order in which they were
// appended.
func (s FlagFilesByCategory) dedup() {
for category, paths := range s {
s[category] = android.FirstUniquePaths(paths)
}
}
// HiddenAPIInfo contains information provided by the hidden API processing. // HiddenAPIInfo contains information provided by the hidden API processing.
// //
// That includes paths resolved from HiddenAPIFlagFileProperties and also generated by hidden API // That includes paths resolved from HiddenAPIFlagFileProperties and also generated by hidden API

14
java/hiddenapi_monolithic.go
View File

@@ -74,9 +74,6 @@ func newMonolithicHiddenAPIInfo(ctx android.ModuleContext, flagFilesByCategory F
} }
} }
// Dedup paths.
monolithicInfo.dedup()
return monolithicInfo return monolithicInfo
} }
@@ -90,15 +87,4 @@ func (i *MonolithicHiddenAPIInfo) append(other *HiddenAPIInfo) {
i.AllFlagsPaths = append(i.AllFlagsPaths, other.AllFlagsPath) i.AllFlagsPaths = append(i.AllFlagsPaths, other.AllFlagsPath)
} }
// dedup removes duplicates in all the paths, while maintaining the order in which they were
// appended.
func (i *MonolithicHiddenAPIInfo) dedup() {
i.FlagsFilesByCategory.dedup()
i.StubFlagsPaths = android.FirstUniquePaths(i.StubFlagsPaths)
i.AnnotationFlagsPaths = android.FirstUniquePaths(i.AnnotationFlagsPaths)
i.MetadataPaths = android.FirstUniquePaths(i.MetadataPaths)
i.IndexPaths = android.FirstUniquePaths(i.IndexPaths)
i.AllFlagsPaths = android.FirstUniquePaths(i.AllFlagsPaths)
}
var MonolithicHiddenAPIInfoProvider = blueprint.NewProvider(MonolithicHiddenAPIInfo{}) var MonolithicHiddenAPIInfoProvider = blueprint.NewProvider(MonolithicHiddenAPIInfo{})