Fix `go vet` issues
Test: go vet ./...
Change-Id: Ifb936ccc5e2b5a2c3fcbbbcb54f680e2973ea1b3
diff --git a/cc/cc.go b/cc/cc.go
index 89d45a9..f8a8225 100644
--- a/cc/cc.go
+++ b/cc/cc.go
@@ -991,33 +991,41 @@
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 @@
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 @@
baseModuleMode = coreMode
}
actx.AddVariationDependencies([]blueprint.Variation{
- {"image", baseModuleMode}, {"link", "shared"}}, vndkExtDepTag,
- vndkdep.getVndkExtendsModuleName())
+ {Mutator: "image", Variation: baseModuleMode},
+ {Mutator: "link", Variation: "shared"},
+ }, vndkExtDepTag, vndkdep.getVndkExtendsModuleName())
}
}
}