tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

prevent module being enabled if in existing BUILD file

Browse source 
If a module is enabled via the module-level allow list,
bp2buildModuleAlwaysConvertList, then we should error if that same
module is hidden by an existing BUILD file.

Bug: 220875679
Test: add a module in a directory covered by an existing BUILD file
Change-Id: I5426bd9edac593690c0989b68a421ac1c3216010
This commit is contained in:
Sam Delmerico 2022-02-25 21:34:51 +00:00
parent 7ed6612fa6
commit 94d26c2bc0
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
android/bazel.go
View file

@ -676,14 +676,21 @@ func (b *BazelModuleBase) shouldConvertWithBp2build(ctx BazelConversionContext,
}
packagePath := ctx.OtherModuleDir(module)
config := ctx.Config().bp2buildPackageConfig
if alwaysConvert && ShouldKeepExistingBuildFileForDir(packagePath) {
ctx.(BaseModuleContext).ModuleErrorf("A module cannot be in a directory listed in bp2buildKeepExistingBuildFile"+
" and also be in bp2buildModuleAlwaysConvert. Directory: '%s'", packagePath)
return false
}
config := ctx.Config().bp2buildPackageConfig
// This is a tristate value: true, false, or unset.
propValue := b.bazelProperties.Bazel_module.Bp2build_available
if bp2buildDefaultTrueRecursively(packagePath, config) {
if alwaysConvert {
ctx.(BaseModuleContext).ModuleErrorf("a module cannot be in a directory marked Bp2BuildDefaultTrue" +
" or Bp2BuildDefaultTrueRecursively and also be in bp2buildModuleAlwaysConvert")
ctx.(BaseModuleContext).ModuleErrorf("A module cannot be in a directory marked Bp2BuildDefaultTrue"+
" or Bp2BuildDefaultTrueRecursively and also be in bp2buildModuleAlwaysConvert. Directory: '%s'",
packagePath)
}
// Allow modules to explicitly opt-out.