Merge "Revert "Create a product variable for skipping apex contribution..."" into main

This commit is contained in:
Treehugger Robot
2024-02-17 02:24:02 +00:00
committed by Gerrit Code Review
3 changed files with 0 additions and 10 deletions

View File

@@ -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())
}

View File

@@ -2044,7 +2044,3 @@ func (c *config) AllApexContributions() []string {
}
return ret
}
func (c *config) BuildIgnoreApexContributionContents() []string {
return c.productVariables.BuildIgnoreApexContributionContents
}

View File

@@ -494,8 +494,6 @@ type ProductVariables struct {
BuildFlags map[string]string `json:",omitempty"`
BuildFromSourceStub *bool `json:",omitempty"`
BuildIgnoreApexContributionContents []string `json:",omitempty"`
}
type PartitionQualifiedVariablesType struct {