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

Commit 0b5a877f authored by Christopher Parsons's avatar Christopher Parsons Committed by Gerrit Code Review
Browse files

Merge changes I5c7f1fc1,I6015581c into main 

* changes:
  Fix comment for Bp2buildDepsMutator config.
  Use parameter name hint for BazelLabelModuleDepsWithFn's markAsDeps.
parents d9cc9ec2 8c49fc7c

android/bazel_paths.go

+3 −3
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ type BazelConversionPathContext interface { 
// or ":<module>") and returns a Bazel-compatible label which corresponds to dependencies on the

// module within the given ctx.

func BazelLabelForModuleDeps(ctx Bp2buildMutatorContext, modules []string) bazel.LabelList {

	return BazelLabelForModuleDepsWithFn(ctx, modules, BazelModuleLabel, true)

	return BazelLabelForModuleDepsWithFn(ctx, modules, BazelModuleLabel, /*markAsDeps=*/true)

}



// BazelLabelForModuleWholeDepsExcludes expects two lists: modules (containing modules to include in
@@ -154,11 +154,11 @@ func BazelLabelForModuleDepsWithFn(ctx Bp2buildMutatorContext, modules []string, 
// the excluded dependencies.

func BazelLabelForModuleDepsExcludesWithFn(ctx Bp2buildMutatorContext, modules, excludes []string,

	moduleToLabelFn func(BazelConversionPathContext, blueprint.Module) string) bazel.LabelList {

	moduleLabels := BazelLabelForModuleDepsWithFn(ctx, RemoveListFromList(modules, excludes), moduleToLabelFn, true)

	moduleLabels := BazelLabelForModuleDepsWithFn(ctx, RemoveListFromList(modules, excludes), moduleToLabelFn, /*markAsDeps=*/true)

	if len(excludes) == 0 {

		return moduleLabels

	}

	excludeLabels := BazelLabelForModuleDepsWithFn(ctx, excludes, moduleToLabelFn, false)

	excludeLabels := BazelLabelForModuleDepsWithFn(ctx, excludes, moduleToLabelFn, /*markAsDeps=*/false)

	return bazel.LabelList{

		Includes: moduleLabels.Includes,

		Excludes: excludeLabels.Includes,

android/config.go

+1 −2
Original line number Diff line number Diff line
@@ -297,8 +297,7 @@ type config struct { 
	// in tests when a path doesn't exist.

	TestAllowNonExistentPaths bool



	// If testAllowNonExistentPaths is true then PathForSource and PathForModuleSrc won't error

	// in tests when a path doesn't exist.

	// If true, register the "bp2build_deps" mutator in the mutator pipeline.

	Bp2buildDepsMutator bool



	// The list of files that when changed, must invalidate soong_build to

cc/bp2build.go

+3 −3
Original line number Diff line number Diff line
@@ -1904,7 +1904,7 @@ func xsdConfigCppTarget(xsd android.XsdConfigBp2buildTargets) string { 
}



func bazelLabelForWholeDeps(ctx android.Bp2buildMutatorContext, modules []string) bazel.LabelList {

	return android.BazelLabelForModuleDepsWithFn(ctx, modules, bazelLabelForStaticWholeModuleDeps, true)

	return android.BazelLabelForModuleDepsWithFn(ctx, modules, bazelLabelForStaticWholeModuleDeps, /*markAsDeps=*/true)

}



func bazelLabelForWholeDepsExcludes(ctx android.Bp2buildMutatorContext, modules, excludes []string) bazel.LabelList {
@@ -1916,11 +1916,11 @@ func bazelLabelForStaticDepsExcludes(ctx android.Bp2buildMutatorContext, modules 
}



func bazelLabelForStaticDeps(ctx android.Bp2buildMutatorContext, modules []string) bazel.LabelList {

	return android.BazelLabelForModuleDepsWithFn(ctx, modules, bazelLabelForStaticModule, true)

	return android.BazelLabelForModuleDepsWithFn(ctx, modules, bazelLabelForStaticModule, /*markAsDeps=*/true)

}



func bazelLabelForSharedDeps(ctx android.Bp2buildMutatorContext, modules []string) bazel.LabelList {

	return android.BazelLabelForModuleDepsWithFn(ctx, modules, bazelLabelForSharedModule, true)

	return android.BazelLabelForModuleDepsWithFn(ctx, modules, bazelLabelForSharedModule, /*markAsDeps=*/true)

}



func bazelLabelForHeaderDeps(ctx android.Bp2buildMutatorContext, modules []string) bazel.LabelList {