Prevent ApexInfoMutator from creating unnecessary variants
Adds the AlwaysRequireApexVariantTag interface to enable ApexInfoMutator to differentiate between a tag that is excluded from apex contents but still requires an apex variant and a tag that is excluded from apex contents and does not require an apex variant. That is needed to support the sdkMemberVersionedDepTag which excludes the target from being added to the APEX but requires an APEX variant. A more detailed explanation is in the comments. The AlwaysRequireApexVariant() method follows the pattern used in ReplaceSourceWithPrebuilt of having a method that returns a bool to trigger the behavior and not say ExcludeFromApexContentsTag that simply relies on the tag implementing an interface to trigger. That is because the former is more flexible and allows a tag type to parameterize the behavior if necessary. The tags that this will exclude from creating an apex variant are: * PrebuiltDepTag - by the time the apex variant has been created any preferred prebuilts will have replaced the sources so there is no need to create an APEX variant if the only dependency path from the APEX to the prebuilt is via this tag. * hiddenApiAnnotationsDependencyTag - the target of which is a purely build time artifect and MUST NEVER end up in the APEX. It will also stop calling DepIsInSameApex for any dependency created by the sdkMemberVersionedDepTag. Which will fix the issue reported in the bug. Bug: 182992071 Test: m nothing Change-Id: I9569e488d6446ca45d3ea8f32a9b74524eb865df
This commit is contained in:
@@ -257,6 +257,9 @@ type ApexProperties struct {
|
||||
}
|
||||
|
||||
// Marker interface that identifies dependencies that are excluded from APEX contents.
|
||||
//
|
||||
// Unless the tag also implements the AlwaysRequireApexVariantTag this will prevent an apex variant
|
||||
// from being created for the module.
|
||||
type ExcludeFromApexContentsTag interface {
|
||||
blueprint.DependencyTag
|
||||
|
||||
@@ -264,6 +267,17 @@ type ExcludeFromApexContentsTag interface {
|
||||
ExcludeFromApexContents()
|
||||
}
|
||||
|
||||
// Marker interface that identifies dependencies that always requires an APEX variant to be created.
|
||||
//
|
||||
// It is possible for a dependency to require an apex variant but exclude the module from the APEX
|
||||
// contents. See sdk.sdkMemberDependencyTag.
|
||||
type AlwaysRequireApexVariantTag interface {
|
||||
blueprint.DependencyTag
|
||||
|
||||
// Return true if this tag requires that the target dependency has an apex variant.
|
||||
AlwaysRequireApexVariant() bool
|
||||
}
|
||||
|
||||
// Marker interface that identifies dependencies that should inherit the DirectlyInAnyApex state
|
||||
// from the parent to the child. For example, stubs libraries are marked as DirectlyInAnyApex if
|
||||
// their implementation is in an apex.
|
||||
|
Reference in New Issue
Block a user