From a923442da622e7a1b485b006b609e9c771ee48df Mon Sep 17 00:00:00 2001 From: Liz Kammer Date: Wed, 22 Dec 2021 15:32:18 -0500 Subject: [PATCH] Add prebuilt_etc_host to bp2build conversion. Test: bp2build.sh Change-Id: I976a7f325f00d65867c27e0c3feba34ff217975f --- etc/prebuilt_etc.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/etc/prebuilt_etc.go b/etc/prebuilt_etc.go index 83de65fe0..377a56651 100644 --- a/etc/prebuilt_etc.go +++ b/etc/prebuilt_etc.go @@ -439,6 +439,7 @@ func PrebuiltEtcHostFactory() android.Module { // This module is host-only android.InitAndroidArchModule(module, android.HostSupported, android.MultilibCommon) android.InitDefaultableModule(module) + android.InitBazelModule(module) return module } @@ -665,7 +666,7 @@ type bazelPrebuiltEtcAttributes struct { // ConvertWithBp2build performs bp2build conversion of PrebuiltEtc func (p *PrebuiltEtc) ConvertWithBp2build(ctx android.TopDownMutatorContext) { // All prebuilt_* modules are PrebuiltEtc, but at this time, we only convert prebuilt_etc modules. - if ctx.ModuleType() != "prebuilt_etc" { + if p.installDirBase != "etc" { return }