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

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

Merge changes Id11f4fb1,Id573d970,Ia94a0b5c 

* changes:
  Fix //conditions:default excludes computation for LabelListAttribute.
  bp2build: split Bazel conversion context into smaller ones, and change TopDownMutatorContext signatures to use Bazel conversion context.
  Add an error check in `bazelPackage` for malformed labels.
parents 8380ee66 9af49a49

android/bazel.go

+5 −5
Original line number Diff line number Diff line
@@ -60,8 +60,8 @@ type Bazelable interface { 
	HasHandcraftedLabel() bool

	HandcraftedLabel() string

	GetBazelLabel(ctx BazelConversionPathContext, module blueprint.Module) string

	ConvertWithBp2build(ctx BazelConversionPathContext) bool

	convertWithBp2build(ctx BazelConversionPathContext, module blueprint.Module) bool

	ConvertWithBp2build(ctx BazelConversionContext) bool

	convertWithBp2build(ctx BazelConversionContext, module blueprint.Module) bool

	GetBazelBuildFileContents(c Config, path, name string) (string, error)

}
@@ -377,7 +377,7 @@ func (b *BazelModuleBase) MixedBuildsEnabled(ctx BazelConversionPathContext) boo 
}



// ConvertedToBazel returns whether this module has been converted (with bp2build or manually) to Bazel.

func convertedToBazel(ctx BazelConversionPathContext, module blueprint.Module) bool {

func convertedToBazel(ctx BazelConversionContext, module blueprint.Module) bool {

	b, ok := module.(Bazelable)

	if !ok {

		return false
@@ -386,11 +386,11 @@ func convertedToBazel(ctx BazelConversionPathContext, module blueprint.Module) b 
}



// ConvertWithBp2build returns whether the given BazelModuleBase should be converted with bp2build.

func (b *BazelModuleBase) ConvertWithBp2build(ctx BazelConversionPathContext) bool {

func (b *BazelModuleBase) ConvertWithBp2build(ctx BazelConversionContext) bool {

	return b.convertWithBp2build(ctx, ctx.Module())

}



func (b *BazelModuleBase) convertWithBp2build(ctx BazelConversionPathContext, module blueprint.Module) bool {

func (b *BazelModuleBase) convertWithBp2build(ctx BazelConversionContext, module blueprint.Module) bool {

	if bp2buildModuleDoNotConvert[module.Name()] {

		return false

	}

android/bazel_paths.go

+37 −19
Original line number Diff line number Diff line
@@ -68,24 +68,36 @@ import ( 
//   cannot be resolved,the function will panic. This is often due to the dependency not being added

//   via an AddDependency* method.



// A minimal context interface to check if a module should be converted by bp2build,

// with functions containing information to match against allowlists and denylists.

// If a module is deemed to be convertible by bp2build, then it should rely on a

// BazelConversionPathContext for more functions for dep/path features.

type BazelConversionContext interface {

	Config() Config



	Module() Module

	OtherModuleType(m blueprint.Module) string

	OtherModuleName(m blueprint.Module) string

	OtherModuleDir(m blueprint.Module) string

}



// A subset of the ModuleContext methods which are sufficient to resolve references to paths/deps in

// order to form a Bazel-compatible label for conversion.

type BazelConversionPathContext interface {

	EarlyModulePathContext

	BazelConversionContext



	ModuleErrorf(fmt string, args ...interface{})

	PropertyErrorf(property, fmt string, args ...interface{})

	GetDirectDep(name string) (blueprint.Module, blueprint.DependencyTag)

	ModuleFromName(name string) (blueprint.Module, bool)

	Module() Module

	OtherModuleType(m blueprint.Module) string

	OtherModuleName(m blueprint.Module) string

	OtherModuleDir(m blueprint.Module) string

	AddUnconvertedBp2buildDep(string)

}



// BazelLabelForModuleDeps expects a list of reference to other modules, ("<module>"

// or ":<module>") and returns a Bazel-compatible label which corresponds to dependencies on the

// module within the given ctx.

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

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

	return BazelLabelForModuleDepsWithFn(ctx, modules, BazelModuleLabel)

}
@@ -95,15 +107,15 @@ func BazelLabelForModuleDeps(ctx TopDownMutatorContext, modules []string) bazel. 
// list which corresponds to dependencies on the module within the given ctx, and the excluded

// dependencies.  Prebuilt dependencies will be appended with _alwayslink so they can be handled as

// whole static libraries.

func BazelLabelForModuleDepsExcludes(ctx TopDownMutatorContext, modules, excludes []string) bazel.LabelList {

func BazelLabelForModuleDepsExcludes(ctx BazelConversionPathContext, modules, excludes []string) bazel.LabelList {

	return BazelLabelForModuleDepsExcludesWithFn(ctx, modules, excludes, BazelModuleLabel)

}



// BazelLabelForModuleDepsWithFn expects a list of reference to other modules, ("<module>"

// or ":<module>") and applies moduleToLabelFn to determine and return a Bazel-compatible label

// which corresponds to dependencies on the module within the given ctx.

func BazelLabelForModuleDepsWithFn(ctx TopDownMutatorContext, modules []string,

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

func BazelLabelForModuleDepsWithFn(ctx BazelConversionPathContext, modules []string,

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

	var labels bazel.LabelList

	// In some cases, a nil string list is different than an explicitly empty list.

	if len(modules) == 0 && modules != nil {
@@ -131,8 +143,8 @@ func BazelLabelForModuleDepsWithFn(ctx TopDownMutatorContext, modules []string, 
// to other modules, ("<module>" or ":<module>"). It applies moduleToLabelFn to determine and return a

// Bazel-compatible label list which corresponds to dependencies on the module within the given ctx, and

// the excluded dependencies.

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

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

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

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

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

	if len(excludes) == 0 {

		return moduleLabels
@@ -144,11 +156,11 @@ func BazelLabelForModuleDepsExcludesWithFn(ctx TopDownMutatorContext, modules, e 
	}

}



func BazelLabelForModuleSrcSingle(ctx TopDownMutatorContext, path string) bazel.Label {

func BazelLabelForModuleSrcSingle(ctx BazelConversionPathContext, path string) bazel.Label {

	return BazelLabelForModuleSrcExcludes(ctx, []string{path}, []string(nil)).Includes[0]

}



func BazelLabelForModuleDepSingle(ctx TopDownMutatorContext, path string) bazel.Label {

func BazelLabelForModuleDepSingle(ctx BazelConversionPathContext, path string) bazel.Label {

	return BazelLabelForModuleDepsExcludes(ctx, []string{path}, []string(nil)).Includes[0]

}
@@ -158,7 +170,7 @@ func BazelLabelForModuleDepSingle(ctx TopDownMutatorContext, path string) bazel. 
// relative if within the same package).

// Properties must have been annotated with struct tag `android:"path"` so that dependencies modules

// will have already been handled by the path_deps mutator.

func BazelLabelForModuleSrc(ctx TopDownMutatorContext, paths []string) bazel.LabelList {

func BazelLabelForModuleSrc(ctx BazelConversionPathContext, paths []string) bazel.LabelList {

	return BazelLabelForModuleSrcExcludes(ctx, paths, []string(nil))

}
@@ -168,7 +180,7 @@ func BazelLabelForModuleSrc(ctx TopDownMutatorContext, paths []string) bazel.Lab 
// (absolute if in a different package or relative if within the same package).

// Properties must have been annotated with struct tag `android:"path"` so that dependencies modules

// will have already been handled by the path_deps mutator.

func BazelLabelForModuleSrcExcludes(ctx TopDownMutatorContext, paths, excludes []string) bazel.LabelList {

func BazelLabelForModuleSrcExcludes(ctx BazelConversionPathContext, paths, excludes []string) bazel.LabelList {

	excludeLabels := expandSrcsForBazel(ctx, excludes, []string(nil))

	excluded := make([]string, 0, len(excludeLabels.Includes))

	for _, e := range excludeLabels.Includes {
@@ -288,7 +300,7 @@ func transformSubpackagePaths(ctx BazelConversionPathContext, paths bazel.LabelL 
// Properties passed as the paths or excludes argument must have been annotated with struct tag

// `android:"path"` so that dependencies on other modules will have already been handled by the

// path_deps mutator.

func expandSrcsForBazel(ctx TopDownMutatorContext, paths, expandedExcludes []string) bazel.LabelList {

func expandSrcsForBazel(ctx BazelConversionPathContext, paths, expandedExcludes []string) bazel.LabelList {

	if paths == nil {

		return bazel.LabelList{}

	}
@@ -336,8 +348,8 @@ func expandSrcsForBazel(ctx TopDownMutatorContext, paths, expandedExcludes []str 
// getOtherModuleLabel returns a bazel.Label for the given dependency/tag combination for the

// module. The label will be relative to the current directory if appropriate. The dependency must

// already be resolved by either deps mutator or path deps mutator.

func getOtherModuleLabel(ctx TopDownMutatorContext, dep, tag string,

	labelFromModule func(TopDownMutatorContext, blueprint.Module) string) bazel.Label {

func getOtherModuleLabel(ctx BazelConversionPathContext, dep, tag string,

	labelFromModule func(BazelConversionPathContext, blueprint.Module) string) bazel.Label {

	m, _ := ctx.ModuleFromName(dep)

	if m == nil {

		panic(fmt.Errorf("No module named %q found, but was a direct dep of %q", dep, ctx.Module().Name()))
@@ -359,7 +371,7 @@ func getOtherModuleLabel(ctx TopDownMutatorContext, dep, tag string, 
	}

}



func BazelModuleLabel(ctx TopDownMutatorContext, module blueprint.Module) string {

func BazelModuleLabel(ctx BazelConversionPathContext, module blueprint.Module) string {

	// TODO(b/165114590): Convert tag (":name{.tag}") to corresponding Bazel implicit output targets.

	if !convertedToBazel(ctx, module) {

		return bp2buildModuleLabel(ctx, module)
@@ -370,11 +382,17 @@ func BazelModuleLabel(ctx TopDownMutatorContext, module blueprint.Module) string 


func bazelShortLabel(label string) string {

	i := strings.Index(label, ":")

	if i == -1 {

		panic(fmt.Errorf("Could not find the ':' character in '%s', expected a fully qualified label.", label))

	}

	return label[i:]

}



func bazelPackage(label string) string {

	i := strings.Index(label, ":")

	if i == -1 {

		panic(fmt.Errorf("Could not find the ':' character in '%s', expected a fully qualified label.", label))

	}

	return label[0:i]

}
@@ -382,7 +400,7 @@ func samePackage(label1, label2 string) bool { 
	return bazelPackage(label1) == bazelPackage(label2)

}



func bp2buildModuleLabel(ctx BazelConversionPathContext, module blueprint.Module) string {

func bp2buildModuleLabel(ctx BazelConversionContext, module blueprint.Module) string {

	moduleName := ctx.OtherModuleName(module)

	moduleDir := ctx.OtherModuleDir(module)

	return fmt.Sprintf("//%s:%s", moduleDir, moduleName)

android/variable.go

+1 −1
Original line number Diff line number Diff line
@@ -498,7 +498,7 @@ type ProductConfigProperties map[string]map[string]ProductConfigProperty 


// ProductVariableProperties returns a ProductConfigProperties containing only the properties which

// have been set for the module in the given context.

func ProductVariableProperties(ctx BaseMutatorContext) ProductConfigProperties {

func ProductVariableProperties(ctx BazelConversionPathContext) ProductConfigProperties {

	module := ctx.Module()

	moduleBase := module.base()

bazel/properties.go

+7 −3
Original line number Diff line number Diff line
@@ -534,9 +534,13 @@ func (lla *LabelListAttribute) ResolveExcludes() { 
			lla.ConfigurableValues[axis][config] = SubtractBazelLabelList(val, lla.Value)

		}



		// Now that the Value list is finalized for this axis, compare it with the original

		// list, and put the difference into the default condition for the axis.

		lla.ConfigurableValues[axis][ConditionsDefaultConfigKey] = SubtractBazelLabelList(baseLabels, lla.Value)

		// Now that the Value list is finalized for this axis, compare it with

		// the original list, and union the difference with the default

		// condition for the axis.

		difference := SubtractBazelLabelList(baseLabels, lla.Value)

		existingDefaults := lla.ConfigurableValues[axis][ConditionsDefaultConfigKey]

		existingDefaults.Append(difference)

		lla.ConfigurableValues[axis][ConditionsDefaultConfigKey] = FirstUniqueBazelLabelList(existingDefaults)



		// if everything ends up without includes, just delete the axis

		if !lla.ConfigurableValues[axis].HasConfigurableValues() {

bazel/properties_test.go

+29 −16
Original line number Diff line number Diff line
@@ -238,6 +238,7 @@ func TestResolveExcludes(t *testing.T) { 
			ArchConfigurationAxis: labelListSelectValues{

				"arm":                      makeLabelList([]string{}, []string{"arm_exclude"}),

				"x86":                      makeLabelList([]string{"x86_include"}, []string{}),

				ConditionsDefaultConfigKey: makeLabelList([]string{"default_include"}, []string{}),

			},

			OsConfigurationAxis: labelListSelectValues{

				"android": makeLabelList([]string{}, []string{"android_exclude"}),
@@ -246,7 +247,13 @@ func TestResolveExcludes(t *testing.T) { 
			OsArchConfigurationAxis: labelListSelectValues{

				"linux_x86": makeLabelList([]string{"linux_x86_include"}, []string{}),

			},

			ProductVariableConfigurationAxis("a"): labelListSelectValues{

			ProductVariableConfigurationAxis("product_with_defaults"): labelListSelectValues{

				"a":                        makeLabelList([]string{}, []string{"not_in_value"}),

				"b":                        makeLabelList([]string{"b_val"}, []string{}),

				"c":                        makeLabelList([]string{"c_val"}, []string{}),

				ConditionsDefaultConfigKey: makeLabelList([]string{"c_val", "default", "default2"}, []string{}),

			},

			ProductVariableConfigurationAxis("product_only_with_excludes"): labelListSelectValues{

				"a": makeLabelList([]string{}, []string{"not_in_value"}),

			},

		},
@@ -254,25 +261,31 @@ func TestResolveExcludes(t *testing.T) { 


	attr.ResolveExcludes()



	expectedBaseIncludes := []Label{Label{Label: "all_include"}}

	expectedBaseIncludes := []Label{{Label: "all_include"}}

	if !reflect.DeepEqual(expectedBaseIncludes, attr.Value.Includes) {

		t.Errorf("Expected Value includes %q, got %q", attr.Value.Includes, expectedBaseIncludes)

	}

	var nilLabels []Label

	expectedConfiguredIncludes := map[ConfigurationAxis]map[string][]Label{

		ArchConfigurationAxis: map[string][]Label{

		ArchConfigurationAxis: {

			"arm":                      nilLabels,

			"x86":                      makeLabels("arm_exclude", "x86_include"),

			"conditions_default": makeLabels("arm_exclude"),

			ConditionsDefaultConfigKey: makeLabels("arm_exclude", "default_include"),

		},

		OsConfigurationAxis: map[string][]Label{

		OsConfigurationAxis: {

			"android":                  nilLabels,

			"linux":                    makeLabels("android_exclude", "linux_include"),

			"conditions_default": makeLabels("android_exclude"),

			ConditionsDefaultConfigKey: makeLabels("android_exclude"),

		},

		OsArchConfigurationAxis: map[string][]Label{

		OsArchConfigurationAxis: {

			"linux_x86":                makeLabels("linux_x86_include"),

			"conditions_default": nilLabels,

			ConditionsDefaultConfigKey: nilLabels,

		},

		ProductVariableConfigurationAxis("product_with_defaults"): {

			"a":                        nilLabels,

			"b":                        makeLabels("b_val"),

			"c":                        makeLabels("c_val"),

			ConditionsDefaultConfigKey: makeLabels("c_val", "default", "default2"),

		},

	}

	for _, axis := range attr.SortedConfigurationAxes() {
@@ -288,7 +301,7 @@ func TestResolveExcludes(t *testing.T) { 
		for config, value := range gotForAxis {

			if expected, ok := expectedForAxis[config]; ok {

				if !reflect.DeepEqual(expected, value.Includes) {

					t.Errorf("For %s, expected: %#v, got %#v", axis, expected, value.Includes)

					t.Errorf("For %s,\nexpected: %#v\ngot %#v", axis, expected, value.Includes)

				}

			} else {

				t.Errorf("Got unexpected config %q for %s", config, axis)