Fix `go vet` issues (59339a29) · Commits · e / os / android_build_soong

android/config_test.go

+2 −2

Original line number	Diff line number	Diff line
		@@ -50,7 +50,7 @@ func validateConfigAnnotations(configurable jsonConfigurable) (err error) {
		}

		type configType struct {
		populateMe *bool `json:"omitempty"`
		PopulateMe *bool `json:"omitempty"`
		}

		func (c *configType) SetDefaultConfig() {
		@@ -60,7 +60,7 @@ func (c *configType) SetDefaultConfig() {
		func TestValidateConfigAnnotations(t *testing.T) {
		config := configType{}
		err := validateConfigAnnotations(&config)
		expectedError := `Field configType.populateMe has tag json:"omitempty" which specifies to change its json field name to "omitempty".
		expectedError := `Field configType.PopulateMe has tag json:"omitempty" which specifies to change its json field name to "omitempty".
		Did you mean to use an annotation of ",omitempty"?
		(Alternatively, to change the json name of the field, rename the field in source instead.)`
		if err.Error() != expectedError {

android/makevars.go

+2 −2

Original line number	Diff line number	Diff line
		@@ -153,7 +153,7 @@ func (s *makeVarsSingleton) GenerateBuildActions(ctx SingletonContext) {
		func (s *makeVarsSingleton) writeVars(vars []makeVarsVariable) []byte {
		buf := &bytes.Buffer{}

		fmt.Fprintln(buf, `# Autogenerated file
		fmt.Fprint(buf, `# Autogenerated file

		# Compares SOONG_$(1) against $(1), and warns if they are not equal.
		#
		@@ -201,7 +201,7 @@ my_check_failed := false
		fmt.Fprintf(buf, "$(eval $(call soong-compare-var,%s,%s,my_check_failed := true))\n\n", v.name, sort)
		}

		fmt.Fprintln(buf, `
		fmt.Fprint(buf, `
		ifneq ($(my_check_failed),false)
		$(error Soong variable check failed)
		endif

android/namespace.go

+1 −3

Original line number	Diff line number	Diff line
		@@ -94,10 +94,8 @@ type NameResolver struct {
		}

		func NewNameResolver(namespaceExportFilter func(Namespace) bool) NameResolver {
		namespacesByDir := sync.Map{}

		r := &NameResolver{
		namespacesByDir: namespacesByDir,
		namespacesByDir: sync.Map{},
		namespaceExportFilter: namespaceExportFilter,
		}
		r.rootNamespace = r.newNamespace(".")

bpfix/bpfix/bpfix.go

+0 −1

Original line number	Diff line number	Diff line
		@@ -141,7 +141,6 @@ func (f Fixer) Fix(config FixRequest) (parser.File, error) {
		i++
		if i >= maxNumIterations {
		return nil, fmt.Errorf("Applied fixes %d times and yet the tree continued to change. Is there an infinite loop?", i)
		break
		}
		}
		return f.tree, err

cc/cc.go

+27 −14

Original line number	Diff line number	Diff line
		@@ -991,33 +991,41 @@ func (c *Module) DepsMutator(actx android.BottomUpMutatorContext) {
		actx.AddVariationDependencies(nil, depTag, lib)
		}

		actx.AddVariationDependencies([]blueprint.Variation{{"link", "static"}}, wholeStaticDepTag,
		deps.WholeStaticLibs...)
		actx.AddVariationDependencies([]blueprint.Variation{
		{Mutator: "link", Variation: "static"},
		}, wholeStaticDepTag, deps.WholeStaticLibs...)

		for _, lib := range deps.StaticLibs {
		depTag := staticDepTag
		if inList(lib, deps.ReexportStaticLibHeaders) {
		depTag = staticExportDepTag
		}
		actx.AddVariationDependencies([]blueprint.Variation{{"link", "static"}}, depTag, lib)
		actx.AddVariationDependencies([]blueprint.Variation{
		{Mutator: "link", Variation: "static"},
		}, depTag, lib)
		}

		actx.AddVariationDependencies([]blueprint.Variation{{"link", "static"}}, lateStaticDepTag,
		deps.LateStaticLibs...)
		actx.AddVariationDependencies([]blueprint.Variation{
		{Mutator: "link", Variation: "static"},
		}, lateStaticDepTag, deps.LateStaticLibs...)

		for _, lib := range deps.SharedLibs {
		depTag := sharedDepTag
		if inList(lib, deps.ReexportSharedLibHeaders) {
		depTag = sharedExportDepTag
		}
		actx.AddVariationDependencies([]blueprint.Variation{{"link", "shared"}}, depTag, lib)
		actx.AddVariationDependencies([]blueprint.Variation{
		{Mutator: "link", Variation: "shared"},
		}, depTag, lib)
		}

		actx.AddVariationDependencies([]blueprint.Variation{{"link", "shared"}}, lateSharedDepTag,
		deps.LateSharedLibs...)
		actx.AddVariationDependencies([]blueprint.Variation{
		{Mutator: "link", Variation: "shared"},
		}, lateSharedDepTag, deps.LateSharedLibs...)

		actx.AddVariationDependencies([]blueprint.Variation{{"link", "shared"}}, runtimeDepTag,
		deps.RuntimeLibs...)
		actx.AddVariationDependencies([]blueprint.Variation{
		{Mutator: "link", Variation: "shared"},
		}, runtimeDepTag, deps.RuntimeLibs...)

		actx.AddDependency(c, genSourceDepTag, deps.GeneratedSources...)

		@@ -1043,9 +1051,13 @@ func (c *Module) DepsMutator(actx android.BottomUpMutatorContext) {

		version := ctx.sdkVersion()
		actx.AddVariationDependencies([]blueprint.Variation{
		{"ndk_api", version}, {"link", "shared"}}, ndkStubDepTag, variantNdkLibs...)
		{Mutator: "ndk_api", Variation: version},
		{Mutator: "link", Variation: "shared"},
		}, ndkStubDepTag, variantNdkLibs...)
		actx.AddVariationDependencies([]blueprint.Variation{
		{"ndk_api", version}, {"link", "shared"}}, ndkLateStubDepTag, variantLateNdkLibs...)
		{Mutator: "ndk_api", Variation: version},
		{Mutator: "link", Variation: "shared"},
		}, ndkLateStubDepTag, variantLateNdkLibs...)

		if vndkdep := c.vndkdep; vndkdep != nil {
		if vndkdep.isVndkExt() {
		@@ -1054,8 +1066,9 @@ func (c *Module) DepsMutator(actx android.BottomUpMutatorContext) {
		baseModuleMode = coreMode
		}
		actx.AddVariationDependencies([]blueprint.Variation{
		{"image", baseModuleMode}, {"link", "shared"}}, vndkExtDepTag,
		vndkdep.getVndkExtendsModuleName())
		{Mutator: "image", Variation: baseModuleMode},
		{Mutator: "link", Variation: "shared"},
		}, vndkExtDepTag, vndkdep.getVndkExtendsModuleName())
		}
		}
		}