From 2063a0d7b8b7e7da495ea50d3998d11480a2d3b2 Mon Sep 17 00:00:00 2001
From: "Lukacs T. Berki" <lberki@google.com>
Date: Thu, 17 Jun 2021 09:32:36 +0200
Subject: [PATCH] Make the IsSdkVariant field and method the same.

Before, the IsSdkVariant() method also checked AlwaysSdk(). Instead,
sdkMutator now sets the IsSdkVariant field to True even for the single
variation it creates when AlwaysSdk is true.

Test: Presubmits.
Change-Id: Ied8b42a3441a30484ef8c5dff5aade5fe92574bb
---
 cc/cc.go  | 2 +-
 cc/sdk.go | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/cc/cc.go b/cc/cc.go
index 2e094d007..49e218edc 100644
--- a/cc/cc.go
+++ b/cc/cc.go
@@ -3383,7 +3383,7 @@ func DefaultsFactory(props ...interface{}) android.Module {
 }
 
 func (c *Module) IsSdkVariant() bool {
-	return c.Properties.IsSdkVariant || c.AlwaysSdk()
+	return c.Properties.IsSdkVariant
 }
 
 func kytheExtractAllFactory() android.Singleton {
diff --git a/cc/sdk.go b/cc/sdk.go
index aec950b94..69ad311e2 100644
--- a/cc/sdk.go
+++ b/cc/sdk.go
@@ -35,7 +35,8 @@ func sdkMutator(ctx android.BottomUpMutatorContext) {
 			if !m.UseSdk() && !m.SplitPerApiLevel() {
 				ctx.ModuleErrorf("UseSdk() must return true when AlwaysSdk is set, did the factory forget to set Sdk_version?")
 			}
-			ctx.CreateVariations("sdk")
+			modules := ctx.CreateVariations("sdk")
+			modules[0].(*Module).Properties.IsSdkVariant = true
 		} else if m.UseSdk() || m.SplitPerApiLevel() {
 			modules := ctx.CreateVariations("", "sdk")