Merge SP1A.210616.001

Change-Id: I93c80df288abe7780005a793240e6dc9d39245cb

1 files changed, 5 insertions, 1 deletions

diff --git a/cc/cc.go b/cc/cc.go
index 2193b2cfb..2dc955b38 100644
--- a/cc/cc.go
+++ b/cc/cc.go
@@ -1976,9 +1976,13 @@ func GetCrtVariations(ctx android.BottomUpMutatorContext,
 		if minSdkVersion == "" || minSdkVersion == "apex_inherit" {
 			minSdkVersion = m.SdkVersion()
 		}
+		apiLevel, err := android.ApiLevelFromUser(ctx, minSdkVersion)
+		if err != nil {
+			ctx.PropertyErrorf("min_sdk_version", err.Error())
+		}
 		return []blueprint.Variation{
 			{Mutator: "sdk", Variation: "sdk"},
-			{Mutator: "version", Variation: minSdkVersion},
+			{Mutator: "version", Variation: apiLevel.String()},
 		}
 	}
 	return []blueprint.Variation{