From c45a86a65da19956c1dfaa18ad0b331130828f5b Mon Sep 17 00:00:00 2001 From: Paul Duffin Date: Wed, 9 Jun 2021 14:39:28 +0100 Subject: [PATCH] Export hidden api related types and fields This will export some hidden api related types and fields so they can be used from outside the java package. This is needed to allow a follow up change to move the TestPlatformBootclasspath_Fragments from the java to the apex package. Bug: 179354495 Test: m nothing Merged-In: Ib69eea9d79cc83b8e3fc29919a29f071e1ec17b5 Change-Id: Ib69eea9d79cc83b8e3fc29919a29f071e1ec17b5 (cherry picked from commit 524c82c01acbd1f45a401d3444354cd69dd342e3) --- java/bootclasspath_fragment.go | 4 ++-- java/hiddenapi_modular.go | 30 ++++++++++++++--------------- java/hiddenapi_monolithic.go | 2 +- java/platform_bootclasspath.go | 3 +-- java/platform_bootclasspath_test.go | 6 +++--- 5 files changed, 22 insertions(+), 23 deletions(-) diff --git a/java/bootclasspath_fragment.go b/java/bootclasspath_fragment.go index 1c7ad78ec..4aaf3d43f 100644 --- a/java/bootclasspath_fragment.go +++ b/java/bootclasspath_fragment.go @@ -763,7 +763,7 @@ func (b *bootclasspathFragmentSdkMemberProperties) AddToPropertySet(ctx android. // Copy manually curated flag files specified on the bootclasspath_fragment. if b.Flag_files_by_category != nil { - for _, category := range hiddenAPIFlagFileCategories { + for _, category := range HiddenAPIFlagFileCategories { paths := b.Flag_files_by_category[category] if len(paths) > 0 { dests := []string{} @@ -772,7 +772,7 @@ func (b *bootclasspathFragmentSdkMemberProperties) AddToPropertySet(ctx android. builder.CopyToSnapshot(p, dest) dests = append(dests, dest) } - hiddenAPISet.AddProperty(category.propertyName, dests) + hiddenAPISet.AddProperty(category.PropertyName, dests) } } } diff --git a/java/hiddenapi_modular.go b/java/hiddenapi_modular.go index f2649d3c0..54effa967 100644 --- a/java/hiddenapi_modular.go +++ b/java/hiddenapi_modular.go @@ -248,8 +248,8 @@ type HiddenAPIFlagFileProperties struct { } type hiddenAPIFlagFileCategory struct { - // propertyName is the name of the property for this category. - propertyName string + // PropertyName is the name of the property for this category. + PropertyName string // propertyValueReader retrieves the value of the property for this category from the set of // properties. @@ -262,12 +262,12 @@ type hiddenAPIFlagFileCategory struct { // The flag file category for removed members of the API. // -// This is extracted from hiddenAPIFlagFileCategories as it is needed to add the dex signatures +// This is extracted from HiddenAPIFlagFileCategories as it is needed to add the dex signatures // list of removed API members that are generated automatically from the removed.txt files provided // by API stubs. var hiddenAPIRemovedFlagFileCategory = &hiddenAPIFlagFileCategory{ // See HiddenAPIFlagFileProperties.Removed - propertyName: "removed", + PropertyName: "removed", propertyValueReader: func(properties *HiddenAPIFlagFileProperties) []string { return properties.Removed }, @@ -276,10 +276,10 @@ var hiddenAPIRemovedFlagFileCategory = &hiddenAPIFlagFileCategory{ }, } -var hiddenAPIFlagFileCategories = []*hiddenAPIFlagFileCategory{ +var HiddenAPIFlagFileCategories = []*hiddenAPIFlagFileCategory{ // See HiddenAPIFlagFileProperties.Unsupported { - propertyName: "unsupported", + PropertyName: "unsupported", propertyValueReader: func(properties *HiddenAPIFlagFileProperties) []string { return properties.Unsupported }, @@ -290,7 +290,7 @@ var hiddenAPIFlagFileCategories = []*hiddenAPIFlagFileCategory{ hiddenAPIRemovedFlagFileCategory, // See HiddenAPIFlagFileProperties.Max_target_r_low_priority { - propertyName: "max_target_r_low_priority", + PropertyName: "max_target_r_low_priority", propertyValueReader: func(properties *HiddenAPIFlagFileProperties) []string { return properties.Max_target_r_low_priority }, @@ -300,7 +300,7 @@ var hiddenAPIFlagFileCategories = []*hiddenAPIFlagFileCategory{ }, // See HiddenAPIFlagFileProperties.Max_target_q { - propertyName: "max_target_q", + PropertyName: "max_target_q", propertyValueReader: func(properties *HiddenAPIFlagFileProperties) []string { return properties.Max_target_q }, @@ -310,7 +310,7 @@ var hiddenAPIFlagFileCategories = []*hiddenAPIFlagFileCategory{ }, // See HiddenAPIFlagFileProperties.Max_target_p { - propertyName: "max_target_p", + PropertyName: "max_target_p", propertyValueReader: func(properties *HiddenAPIFlagFileProperties) []string { return properties.Max_target_p }, @@ -320,7 +320,7 @@ var hiddenAPIFlagFileCategories = []*hiddenAPIFlagFileCategory{ }, // See HiddenAPIFlagFileProperties.Max_target_o_low_priority { - propertyName: "max_target_o_low_priority", + PropertyName: "max_target_o_low_priority", propertyValueReader: func(properties *HiddenAPIFlagFileProperties) []string { return properties.Max_target_o_low_priority }, @@ -330,7 +330,7 @@ var hiddenAPIFlagFileCategories = []*hiddenAPIFlagFileCategory{ }, // See HiddenAPIFlagFileProperties.Blocked { - propertyName: "blocked", + PropertyName: "blocked", propertyValueReader: func(properties *HiddenAPIFlagFileProperties) []string { return properties.Blocked }, @@ -340,7 +340,7 @@ var hiddenAPIFlagFileCategories = []*hiddenAPIFlagFileCategory{ }, // See HiddenAPIFlagFileProperties.Unsupported_packages { - propertyName: "unsupported_packages", + PropertyName: "unsupported_packages", propertyValueReader: func(properties *HiddenAPIFlagFileProperties) []string { return properties.Unsupported_packages }, @@ -355,7 +355,7 @@ type FlagFilesByCategory map[*hiddenAPIFlagFileCategory]android.Paths // append appends the supplied flags files to the corresponding category in this map. func (s FlagFilesByCategory) append(other FlagFilesByCategory) { - for _, category := range hiddenAPIFlagFileCategories { + for _, category := range HiddenAPIFlagFileCategories { s[category] = append(s[category], other[category]...) } } @@ -540,7 +540,7 @@ func (i *HiddenAPIFlagInput) gatherStubLibInfo(ctx android.ModuleContext, conten // extractFlagFilesFromProperties extracts the paths to flag files that are specified in the // supplied properties and stores them in this struct. func (i *HiddenAPIFlagInput) extractFlagFilesFromProperties(ctx android.ModuleContext, p *HiddenAPIFlagFileProperties) { - for _, category := range hiddenAPIFlagFileCategories { + for _, category := range HiddenAPIFlagFileCategories { paths := android.PathsForModuleSrc(ctx, category.propertyValueReader(p)) i.FlagFilesByCategory[category] = paths } @@ -630,7 +630,7 @@ func buildRuleToGenerateHiddenApiFlags(ctx android.BuilderContext, name, desc st FlagWithOutput("--output ", tempPath) // Add the options for the different categories of flag files. - for _, category := range hiddenAPIFlagFileCategories { + for _, category := range HiddenAPIFlagFileCategories { paths := flagFilesByCategory[category] for _, path := range paths { category.commandMutator(command, path) diff --git a/java/hiddenapi_monolithic.go b/java/hiddenapi_monolithic.go index a6bf8c705..edf42351f 100644 --- a/java/hiddenapi_monolithic.go +++ b/java/hiddenapi_monolithic.go @@ -99,4 +99,4 @@ func (i *MonolithicHiddenAPIInfo) dedup() { i.AllFlagsPaths = android.FirstUniquePaths(i.AllFlagsPaths) } -var monolithicHiddenAPIInfoProvider = blueprint.NewProvider(MonolithicHiddenAPIInfo{}) +var MonolithicHiddenAPIInfoProvider = blueprint.NewProvider(MonolithicHiddenAPIInfo{}) diff --git a/java/platform_bootclasspath.go b/java/platform_bootclasspath.go index 87c695cb5..7d1e53f8c 100644 --- a/java/platform_bootclasspath.go +++ b/java/platform_bootclasspath.go @@ -280,7 +280,6 @@ func (b *platformBootclasspathModule) generateHiddenAPIBuildActions(ctx android. } monolithicInfo := b.createAndProvideMonolithicHiddenAPIInfo(ctx, fragments) - // Create the input to pass to ruleToGenerateHiddenAPIStubFlagsFile input := newHiddenAPIFlagInput() @@ -342,7 +341,7 @@ func (b *platformBootclasspathModule) createAndProvideMonolithicHiddenAPIInfo(ct monolithicInfo := newMonolithicHiddenAPIInfo(ctx, temporaryInput.FlagFilesByCategory, fragments) // Store the information for testing. - ctx.SetProvider(monolithicHiddenAPIInfoProvider, monolithicInfo) + ctx.SetProvider(MonolithicHiddenAPIInfoProvider, monolithicInfo) return monolithicInfo } diff --git a/java/platform_bootclasspath_test.go b/java/platform_bootclasspath_test.go index ed5549d35..48304446a 100644 --- a/java/platform_bootclasspath_test.go +++ b/java/platform_bootclasspath_test.go @@ -245,10 +245,10 @@ func TestPlatformBootclasspath_Fragments(t *testing.T) { ).RunTest(t) pbcp := result.Module("platform-bootclasspath", "android_common") - info := result.ModuleProvider(pbcp, monolithicHiddenAPIInfoProvider).(MonolithicHiddenAPIInfo) + info := result.ModuleProvider(pbcp, MonolithicHiddenAPIInfoProvider).(MonolithicHiddenAPIInfo) - for _, category := range hiddenAPIFlagFileCategories { - name := category.propertyName + for _, category := range HiddenAPIFlagFileCategories { + name := category.PropertyName message := fmt.Sprintf("category %s", name) filename := strings.ReplaceAll(name, "_", "-") expected := []string{fmt.Sprintf("%s.txt", filename), fmt.Sprintf("bar-%s.txt", filename)}