Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 620753f9 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

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

Merge "Revert "Create a product variable for skipping apex contribution..."" into main am: 3e48d693

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2966054



Change-Id: Id5ec5d2e9fea52488e78b1afea62d902a11f98f6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9f66c04e 3e48d693

android/apex_contributions.go

+0 −4
Original line number Diff line number Diff line
@@ -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())

			}

android/config.go

+0 −4
Original line number Diff line number Diff line
@@ -2047,7 +2047,3 @@ func (c *config) AllApexContributions() []string { 
	}

	return ret

}
 


func (c *config) BuildIgnoreApexContributionContents() []string {

	return c.productVariables.BuildIgnoreApexContributionContents

}

android/variable.go

+0 −2
Original line number Diff line number Diff line
@@ -494,8 +494,6 @@ type ProductVariables struct { 
	BuildFlags map[string]string `json:",omitempty"`



	BuildFromSourceStub *bool `json:",omitempty"`



	BuildIgnoreApexContributionContents []string `json:",omitempty"`

}



type PartitionQualifiedVariablesType struct {