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

Commit 30436204 authored by Spandan Das's avatar Spandan Das Committed by Automerger Merge Worker
Browse files

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

Merge "Revert "Revert "Create a product variable for skipping apex cont..."" into main am: 73f4a4a4 am: 5a1b90d2

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



Change-Id: I8deaced03330bef03a5c63b647ec7d5387b09060
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a4ccd035 5a1b90d2

android/apex_contributions.go

+4 −0
Original line number Diff line number Diff line
@@ -98,6 +98,10 @@ 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

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

	return ret

}



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

	return c.productVariables.BuildIgnoreApexContributionContents

}

android/variable.go

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



	BuildFromSourceStub *bool `json:",omitempty"`



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

}



type PartitionQualifiedVariablesType struct {