From 6e9bc01b97b8b91b51f1198eea30501530a31eda Mon Sep 17 00:00:00 2001 From: Paul Duffin Date: Mon, 19 Jul 2021 13:46:18 +0100 Subject: Remove unnecessary dedup logic The CreateClasspathElements function makes sure that each standalone library and bootclasspath_fragment on the platform bootclasspath appear once and once only and each file extracted is unique to the module so there is no chance that any duplicate files will be used. Bug: 194063708 Test: m out/soong/hiddenapi/hiddenapi-flags.csv - check that this does not change the contents. Change-Id: I60c02baa4d179293ee0f305375afaa3a8c98e112 --- java/hiddenapi_monolithic.go | 14 -------------- 1 file changed, 14 deletions(-) (limited to 'java/hiddenapi_monolithic.go') 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{}) -- cgit v1.2.3-59-g8ed1b