diff options
| -rw-r--r-- | java/hiddenapi_modular.go | 8 | ||||
| -rw-r--r-- | java/hiddenapi_monolithic.go | 14 |
2 files changed, 0 insertions, 22 deletions
diff --git a/java/hiddenapi_modular.go b/java/hiddenapi_modular.go index 654ebb743..86ab8253e 100644 --- a/java/hiddenapi_modular.go +++ b/java/hiddenapi_modular.go @@ -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. // // That includes paths resolved from HiddenAPIFlagFileProperties and also generated by hidden API diff --git a/java/hiddenapi_monolithic.go b/java/hiddenapi_monolithic.go index fdcf09335..404b4c133 100644 --- a/java/hiddenapi_monolithic.go +++ b/java/hiddenapi_monolithic.go @@ -74,9 +74,6 @@ func newMonolithicHiddenAPIInfo(ctx android.ModuleContext, flagFilesByCategory F } } - // Dedup paths. - monolithicInfo.dedup() - return monolithicInfo } @@ -90,15 +87,4 @@ func (i *MonolithicHiddenAPIInfo) append(other *HiddenAPIInfo) { 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{}) |