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

Commit 6e826bab authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "prevent module being enabled if in existing BUILD file" am: fe86b81a 

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1999892

Change-Id: I0cca195fe44e4360006183a6d5c2203d5ea6bdde
parents 9e3f98b8 fe86b81a

android/bazel.go

+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.