diff --git a/android/apex_contributions.go b/android/apex_contributions.go index 89e27b97b..236abf663 100644 --- a/android/apex_contributions.go +++ b/android/apex_contributions.go @@ -98,10 +98,6 @@ func (a *allApexContributions) DepsMutator(ctx BottomUpMutatorContext) { func (a *allApexContributions) SetPrebuiltSelectionInfoProvider(ctx BaseModuleContext) { addContentsToProvider := func(p *PrebuiltSelectionInfoMap, m *apexContributions) { for _, content := range m.Contents() { - // Skip any apexes that have been added to the product specific ignore list - if InList(content, ctx.Config().BuildIgnoreApexContributionContents()) { - continue - } if !ctx.OtherModuleExists(content) && !ctx.Config().AllowMissingDependencies() { ctx.ModuleErrorf("%s listed in apex_contributions %s does not exist\n", content, m.Name()) } diff --git a/android/config.go b/android/config.go index 40497d174..d94a86f71 100644 --- a/android/config.go +++ b/android/config.go @@ -2015,7 +2015,3 @@ func (c *config) AllApexContributions() []string { } return ret } - -func (c *config) BuildIgnoreApexContributionContents() []string { - return c.productVariables.BuildIgnoreApexContributionContents -} diff --git a/android/variable.go b/android/variable.go index 4a8da821b..a4917c54c 100644 --- a/android/variable.go +++ b/android/variable.go @@ -495,8 +495,6 @@ type ProductVariables struct { BuildFlags map[string]string `json:",omitempty"` BuildFromSourceStub *bool `json:",omitempty"` - - BuildIgnoreApexContributionContents []string `json:",omitempty"` } type PartitionQualifiedVariablesType struct {