diff options
| -rw-r--r-- | java/bootclasspath_fragment.go | 4 | ||||
| -rw-r--r-- | java/hiddenapi_modular.go | 59 | ||||
| -rw-r--r-- | java/platform_bootclasspath.go | 4 |
3 files changed, 36 insertions, 31 deletions
diff --git a/java/bootclasspath_fragment.go b/java/bootclasspath_fragment.go index b25dff3f5..7580352d0 100644 --- a/java/bootclasspath_fragment.go +++ b/java/bootclasspath_fragment.go @@ -128,7 +128,7 @@ type bootclasspathFragmentProperties struct { Coverage BootclasspathFragmentCoverageAffectedProperties // Hidden API related properties. - Hidden_api HiddenAPIFlagFileProperties + HiddenAPIFlagFileProperties // The list of additional stub libraries which this fragment's contents use but which are not // provided by another bootclasspath_fragment. @@ -825,7 +825,7 @@ func (b *BootclasspathFragmentModule) createHiddenAPIFlagInput(ctx android.Modul input.gatherStubLibInfo(ctx, contents) // Populate with flag file paths from the properties. - input.extractFlagFilesFromProperties(ctx, &b.properties.Hidden_api) + input.extractFlagFilesFromProperties(ctx, &b.properties.HiddenAPIFlagFileProperties) // Populate with package rules from the properties. input.extractPackageRulesFromProperties(&b.sourceOnlyProperties.HiddenAPIPackageProperties) diff --git a/java/hiddenapi_modular.go b/java/hiddenapi_modular.go index 8b77f367b..3a58675ec 100644 --- a/java/hiddenapi_modular.go +++ b/java/hiddenapi_modular.go @@ -378,32 +378,37 @@ func buildRuleToGenerateHiddenAPIStubFlagsFile(ctx android.BuilderContext, name, // with one Java package per line. All members of all classes within that package (but not nested // packages) will be updated in a property specific way. type HiddenAPIFlagFileProperties struct { - // Marks each signature in the referenced files as being unsupported. - Unsupported []string `android:"path"` + Hidden_api struct { + // Marks each signature in the referenced files as being unsupported. + Unsupported []string `android:"path"` - // Marks each signature in the referenced files as being unsupported because it has been removed. - // Any conflicts with other flags are ignored. - Removed []string `android:"path"` + // Marks each signature in the referenced files as being unsupported because it has been + // removed. Any conflicts with other flags are ignored. + Removed []string `android:"path"` - // Marks each signature in the referenced files as being supported only for targetSdkVersion <= R - // and low priority. - Max_target_r_low_priority []string `android:"path"` + // Marks each signature in the referenced files as being supported only for + // targetSdkVersion <= R and low priority. + Max_target_r_low_priority []string `android:"path"` - // Marks each signature in the referenced files as being supported only for targetSdkVersion <= Q. - Max_target_q []string `android:"path"` + // Marks each signature in the referenced files as being supported only for + // targetSdkVersion <= Q. + Max_target_q []string `android:"path"` - // Marks each signature in the referenced files as being supported only for targetSdkVersion <= P. - Max_target_p []string `android:"path"` + // Marks each signature in the referenced files as being supported only for + // targetSdkVersion <= P. + Max_target_p []string `android:"path"` - // Marks each signature in the referenced files as being supported only for targetSdkVersion <= O - // and low priority. Any conflicts with other flags are ignored. - Max_target_o_low_priority []string `android:"path"` + // Marks each signature in the referenced files as being supported only for + // targetSdkVersion <= O + // and low priority. Any conflicts with other flags are ignored. + Max_target_o_low_priority []string `android:"path"` - // Marks each signature in the referenced files as being blocked. - Blocked []string `android:"path"` + // Marks each signature in the referenced files as being blocked. + Blocked []string `android:"path"` - // Marks each signature in every package in the referenced files as being unsupported. - Unsupported_packages []string `android:"path"` + // Marks each signature in every package in the referenced files as being unsupported. + Unsupported_packages []string `android:"path"` + } } type hiddenAPIFlagFileCategory struct { @@ -428,7 +433,7 @@ var hiddenAPIRemovedFlagFileCategory = &hiddenAPIFlagFileCategory{ // See HiddenAPIFlagFileProperties.Removed PropertyName: "removed", propertyValueReader: func(properties *HiddenAPIFlagFileProperties) []string { - return properties.Removed + return properties.Hidden_api.Removed }, commandMutator: func(command *android.RuleBuilderCommand, path android.Path) { command.FlagWithInput("--unsupported ", path).Flag("--ignore-conflicts ").FlagWithArg("--tag ", "removed") @@ -440,7 +445,7 @@ var HiddenAPIFlagFileCategories = []*hiddenAPIFlagFileCategory{ { PropertyName: "unsupported", propertyValueReader: func(properties *HiddenAPIFlagFileProperties) []string { - return properties.Unsupported + return properties.Hidden_api.Unsupported }, commandMutator: func(command *android.RuleBuilderCommand, path android.Path) { command.FlagWithInput("--unsupported ", path) @@ -451,7 +456,7 @@ var HiddenAPIFlagFileCategories = []*hiddenAPIFlagFileCategory{ { PropertyName: "max_target_r_low_priority", propertyValueReader: func(properties *HiddenAPIFlagFileProperties) []string { - return properties.Max_target_r_low_priority + return properties.Hidden_api.Max_target_r_low_priority }, commandMutator: func(command *android.RuleBuilderCommand, path android.Path) { command.FlagWithInput("--max-target-r ", path).FlagWithArg("--tag ", "lo-prio") @@ -461,7 +466,7 @@ var HiddenAPIFlagFileCategories = []*hiddenAPIFlagFileCategory{ { PropertyName: "max_target_q", propertyValueReader: func(properties *HiddenAPIFlagFileProperties) []string { - return properties.Max_target_q + return properties.Hidden_api.Max_target_q }, commandMutator: func(command *android.RuleBuilderCommand, path android.Path) { command.FlagWithInput("--max-target-q ", path) @@ -471,7 +476,7 @@ var HiddenAPIFlagFileCategories = []*hiddenAPIFlagFileCategory{ { PropertyName: "max_target_p", propertyValueReader: func(properties *HiddenAPIFlagFileProperties) []string { - return properties.Max_target_p + return properties.Hidden_api.Max_target_p }, commandMutator: func(command *android.RuleBuilderCommand, path android.Path) { command.FlagWithInput("--max-target-p ", path) @@ -481,7 +486,7 @@ var HiddenAPIFlagFileCategories = []*hiddenAPIFlagFileCategory{ { PropertyName: "max_target_o_low_priority", propertyValueReader: func(properties *HiddenAPIFlagFileProperties) []string { - return properties.Max_target_o_low_priority + return properties.Hidden_api.Max_target_o_low_priority }, commandMutator: func(command *android.RuleBuilderCommand, path android.Path) { command.FlagWithInput("--max-target-o ", path).Flag("--ignore-conflicts ").FlagWithArg("--tag ", "lo-prio") @@ -491,7 +496,7 @@ var HiddenAPIFlagFileCategories = []*hiddenAPIFlagFileCategory{ { PropertyName: "blocked", propertyValueReader: func(properties *HiddenAPIFlagFileProperties) []string { - return properties.Blocked + return properties.Hidden_api.Blocked }, commandMutator: func(command *android.RuleBuilderCommand, path android.Path) { command.FlagWithInput("--blocked ", path) @@ -501,7 +506,7 @@ var HiddenAPIFlagFileCategories = []*hiddenAPIFlagFileCategory{ { PropertyName: "unsupported_packages", propertyValueReader: func(properties *HiddenAPIFlagFileProperties) []string { - return properties.Unsupported_packages + return properties.Hidden_api.Unsupported_packages }, commandMutator: func(command *android.RuleBuilderCommand, path android.Path) { command.FlagWithInput("--unsupported ", path).Flag("--packages ") diff --git a/java/platform_bootclasspath.go b/java/platform_bootclasspath.go index 1e2723845..24f8253ae 100644 --- a/java/platform_bootclasspath.go +++ b/java/platform_bootclasspath.go @@ -62,7 +62,7 @@ type platformBootclasspathModule struct { type platformBootclasspathProperties struct { BootclasspathFragmentsDepsProperties - Hidden_api HiddenAPIFlagFileProperties + HiddenAPIFlagFileProperties } func platformBootclasspathFactory() android.SingletonModule { @@ -372,7 +372,7 @@ func (b *platformBootclasspathModule) createAndProvideMonolithicHiddenAPIInfo(ct temporaryInput := newHiddenAPIFlagInput() // Create paths to the flag files specified in the properties. - temporaryInput.extractFlagFilesFromProperties(ctx, &b.properties.Hidden_api) + temporaryInput.extractFlagFilesFromProperties(ctx, &b.properties.HiddenAPIFlagFileProperties) // Create the monolithic info, by starting with the flag files specified on this and then merging // in information from all the fragment dependencies of this. |