Merge "Disable cert-dcl16-c clang-tidy check for mingw32."
diff --git a/apex/apex.go b/apex/apex.go
index 5ce0e05..e268499 100644
--- a/apex/apex.go
+++ b/apex/apex.go
@@ -367,6 +367,7 @@
{Mutator: "arch", Variation: arch},
{Mutator: "image", Variation: "core"},
{Mutator: "link", Variation: "shared"},
+ {Mutator: "version", Variation: ""}, // "" is the non-stub variant
}, sharedLibTag, native_shared_libs...)
ctx.AddFarVariationDependencies([]blueprint.Variation{
diff --git a/apex/apex_test.go b/apex/apex_test.go
index c7ef58e..c01c40a 100644
--- a/apex/apex_test.go
+++ b/apex/apex_test.go
@@ -276,13 +276,21 @@
cc_library {
name: "mylib3",
- srcs: ["mylib.cpp"],
- system_shared_libs: [],
+ srcs: ["mylib.cpp"],
+ shared_libs: ["mylib4"],
+ system_shared_libs: [],
stl: "none",
stubs: {
versions: ["10", "11", "12"],
},
}
+
+ cc_library {
+ name: "mylib4",
+ srcs: ["mylib.cpp"],
+ system_shared_libs: [],
+ stl: "none",
+ }
`)
apexRule := ctx.ModuleForTests("myapex", "android_common_myapex").Rule("apexRule")
diff --git a/cc/library.go b/cc/library.go
index 2257e2d..2fd423b 100644
--- a/cc/library.go
+++ b/cc/library.go
@@ -1053,6 +1053,8 @@
l.MutatedProperties.BuildStubs = true
l.MutatedProperties.StubsVersion = versions[i]
m.(*Module).Properties.HideFromMake = true
+ m.(*Module).sanitize = nil
+ m.(*Module).stl = nil
}
}
} else {