Remove apexer.required workaround for aapt2.
Add a filter for cyclic references in required module names in bp2build. Test: CI Bug: 247985196 Bug: 225291837 Fixes: 234748998 Change-Id: Id1cfd0b2e5f217cdb01218ec3bbe11d5070cc9df
This commit is contained in:
@@ -1679,6 +1679,22 @@ filegroup {
|
||||
name: "fg_foo",
|
||||
required: ["reqd"],
|
||||
bazel_module: { bp2build_available: true },
|
||||
}`,
|
||||
ExpectedBazelTargets: []string{
|
||||
MakeBazelTargetNoRestrictions("filegroup", "fg_foo", map[string]string{
|
||||
"data": `[":reqd"]`,
|
||||
}),
|
||||
},
|
||||
},
|
||||
{
|
||||
Description: "Required into data test, cyclic self reference is filtered out",
|
||||
ModuleTypeUnderTest: "filegroup",
|
||||
ModuleTypeUnderTestFactory: android.FileGroupFactory,
|
||||
Blueprint: simpleModuleDoNotConvertBp2build("filegroup", "reqd") + `
|
||||
filegroup {
|
||||
name: "fg_foo",
|
||||
required: ["reqd", "fg_foo"],
|
||||
bazel_module: { bp2build_available: true },
|
||||
}`,
|
||||
ExpectedBazelTargets: []string{
|
||||
MakeBazelTargetNoRestrictions("filegroup", "fg_foo", map[string]string{
|
||||
|
Reference in New Issue
Block a user