Don't create version variations of sdk modules
They are never used, skip creating them.
Test: m checkbuild
Change-Id: I4c8cd544327ae79b781f704be5a9064efdbdf2af
diff --git a/cc/library.go b/cc/library.go
index 059e29b..b5bec95 100644
--- a/cc/library.go
+++ b/cc/library.go
@@ -1545,14 +1545,16 @@
Host() bool
InRamdisk() bool
InRecovery() bool
+ UseSdk() bool
}) bool {
- return !module.Host() && !module.InRamdisk() && !module.InRecovery()
+ return !module.Host() && !module.InRamdisk() && !module.InRecovery() && !module.UseSdk()
}
func CanBeVersionVariant(module interface {
Host() bool
InRamdisk() bool
InRecovery() bool
+ UseSdk() bool
CcLibraryInterface() bool
Shared() bool
Static() bool
diff --git a/rust/rust.go b/rust/rust.go
index 1fc3b0e..9b18c8c 100644
--- a/rust/rust.go
+++ b/rust/rust.go
@@ -1053,7 +1053,7 @@
blueprint.Variation{Mutator: "link", Variation: "static"}),
cc.StaticDepTag(), deps.StaticLibs...)
- crtVariations := append(cc.GetCrtVariations(ctx, mod), commonDepVariations...)
+ crtVariations := cc.GetCrtVariations(ctx, mod)
if deps.CrtBegin != "" {
actx.AddVariationDependencies(crtVariations, cc.CrtBeginDepTag, deps.CrtBegin)
}