Merge changes Ia0e1b307,I63c7c33e into main

* changes:
  Define unstable container
  Define additional exception functions for container enforcement
This commit is contained in:
Treehugger Robot
2024-08-17 04:07:00 +00:00
committed by Gerrit Code Review
5 changed files with 229 additions and 19 deletions

View File

@@ -118,6 +118,9 @@ type Module interface {
TransitivePackagingSpecs() []PackagingSpec
ConfigurableEvaluator(ctx ConfigAndErrorContext) proptools.ConfigurableEvaluator
// Get the information about the containers this module belongs to.
ContainersInfo() ContainersInfo
}
// Qualified id for a module
@@ -885,6 +888,10 @@ type ModuleBase struct {
// complianceMetadataInfo is for different module types to dump metadata.
// See android.ModuleContext interface.
complianceMetadataInfo *ComplianceMetadataInfo
// containersInfo stores the information about the containers and the information of the
// apexes the module belongs to.
containersInfo ContainersInfo
}
func (m *ModuleBase) AddJSONData(d *map[string]interface{}) {
@@ -2091,6 +2098,10 @@ func (m *ModuleBase) moduleInfoVariant(ctx ModuleContext) string {
return variant
}
func (m *ModuleBase) ContainersInfo() ContainersInfo {
return m.containersInfo
}
// Check the supplied dist structure to make sure that it is valid.
//
// property - the base property, e.g. dist or dists[1], which is combined with the