From d5d12d028b8855011169231e24f411d5b138da05 Mon Sep 17 00:00:00 2001 From: Liz Kammer Date: Tue, 5 Sep 2023 09:18:50 -0400 Subject: bp2build: block src == name for prebuilt_* modules src == name causes circular dependency errors, instead mark these as unconverted and don't create modules for them. Test: m bp2build and verify boringssl_self_test.zygote64.rc unconverted Change-Id: I5d5fdd7e14830cd685816064cd0377998d07293c --- xml/xml.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'xml/xml.go') diff --git a/xml/xml.go b/xml/xml.go index 8c0c07282..20a26f562 100644 --- a/xml/xml.go +++ b/xml/xml.go @@ -146,7 +146,11 @@ type bazelPrebuiltEtcXmlAttributes struct { } func (p *prebuiltEtcXml) ConvertWithBp2build(ctx android.TopDownMutatorContext) { - baseAttrs := p.PrebuiltEtc.Bp2buildHelper(ctx) + baseAttrs, convertible := p.PrebuiltEtc.Bp2buildHelper(ctx) + + if !convertible { + return + } var schema *string if p.properties.Schema != nil { -- cgit v1.2.3-59-g8ed1b