Revert "Create a product variable for skipping apex contribution..."
Revert submission 2964509-skip-apex-contributions
Reason for revert: 325666427
Reverted changes: /q/submissionid:2964509-skip-apex-contributions
Change-Id: I510e81c8e06803dc014c9f04c3e357065aa19ce5
diff --git a/android/apex_contributions.go b/android/apex_contributions.go
index 89e27b9..236abf6 100644
--- a/android/apex_contributions.go
+++ b/android/apex_contributions.go
@@ -98,10 +98,6 @@
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 40497d1..d94a86f 100644
--- a/android/config.go
+++ b/android/config.go
@@ -2015,7 +2015,3 @@
}
return ret
}
-
-func (c *config) BuildIgnoreApexContributionContents() []string {
- return c.productVariables.BuildIgnoreApexContributionContents
-}
diff --git a/android/variable.go b/android/variable.go
index 4a8da82..a4917c5 100644
--- a/android/variable.go
+++ b/android/variable.go
@@ -495,8 +495,6 @@
BuildFlags map[string]string `json:",omitempty"`
BuildFromSourceStub *bool `json:",omitempty"`
-
- BuildIgnoreApexContributionContents []string `json:",omitempty"`
}
type PartitionQualifiedVariablesType struct {