summaryrefslogtreecommitdiff
path: root/java/hiddenapi_monolithic.go
diff options
context:
space:
mode:
author Paul Duffin <paulduffin@google.com> 2021-05-21 22:18:56 +0100
committer Paul Duffin <paulduffin@google.com> 2021-05-24 13:32:55 +0100
commitaf99afa919790cc76a9b1a1947d473065ecb65a5 (patch)
tree783327a595eb85038c34858f133e0b87d3b5d074 /java/hiddenapi_monolithic.go
parent1352f7c4715d3d311a2644b9337e4b1028d82cb0 (diff)
Rename hiddenAPIFlagFileInfo to HiddenAPIInfo
This reflects that it has expanded from its initial purpose to include more than just flag files. It is exported for use in tests in other packages. Bug: 179354495 Test: m nothing Change-Id: I9f780b20e18ce3a774e4aa04a276463070a64c34
Diffstat (limited to 'java/hiddenapi_monolithic.go')
-rw-r--r--java/hiddenapi_monolithic.go6
1 files changed, 3 insertions, 3 deletions
diff --git a/java/hiddenapi_monolithic.go b/java/hiddenapi_monolithic.go
index b3b834851..147afce51 100644
--- a/java/hiddenapi_monolithic.go
+++ b/java/hiddenapi_monolithic.go
@@ -55,8 +55,8 @@ func newMonolithicHiddenAPIInfo(ctx android.ModuleContext, flagFilesByCategory F
// Merge all the information from the fragments. The fragments form a DAG so it is possible that
// this will introduce duplicates so they will be resolved after processing all the fragments.
for _, fragment := range fragments {
- if ctx.OtherModuleHasProvider(fragment, hiddenAPIFlagFileInfoProvider) {
- info := ctx.OtherModuleProvider(fragment, hiddenAPIFlagFileInfoProvider).(hiddenAPIFlagFileInfo)
+ if ctx.OtherModuleHasProvider(fragment, HiddenAPIInfoProvider) {
+ info := ctx.OtherModuleProvider(fragment, HiddenAPIInfoProvider).(HiddenAPIInfo)
monolithicInfo.append(&info)
}
}
@@ -68,7 +68,7 @@ func newMonolithicHiddenAPIInfo(ctx android.ModuleContext, flagFilesByCategory F
}
// append appends all the files from the supplied info to the corresponding files in this struct.
-func (i *MonolithicHiddenAPIInfo) append(other *hiddenAPIFlagFileInfo) {
+func (i *MonolithicHiddenAPIInfo) append(other *HiddenAPIInfo) {
i.FlagsFilesByCategory.append(other.FlagFilesByCategory)
i.StubFlagsPaths = append(i.StubFlagsPaths, other.StubFlagsPath)
i.AnnotationFlagsPaths = append(i.AnnotationFlagsPaths, other.AnnotationFlagsPath)