From 565cafdcb1178c0d6804583546ecd8069439de0c Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Fri, 25 Sep 2020 18:47:38 -0700
Subject: [PATCH] Don't create version variations of sdk modules

They are never used, skip creating them.

Test: m checkbuild
Change-Id: I4c8cd544327ae79b781f704be5a9064efdbdf2af
---
 cc/library.go | 4 +++-
 rust/rust.go  | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/cc/library.go b/cc/library.go
index 059e29b9c..b5bec952a 100644
--- a/cc/library.go
+++ b/cc/library.go
@@ -1545,14 +1545,16 @@ func CanBeOrLinkAgainstVersionVariants(module interface {
 	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 1fc3b0e2c..9b18c8c76 100644
--- a/rust/rust.go
+++ b/rust/rust.go
@@ -1053,7 +1053,7 @@ func (mod *Module) DepsMutator(actx android.BottomUpMutatorContext) {
 		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)
 	}