Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fe86b81a authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "prevent module being enabled if in existing BUILD file"

parents d508a638 94d26c2b
Loading
Loading
Loading
Loading
+10 −3
Original line number Diff line number Diff line
@@ -679,14 +679,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.