Merge "Raise minsdk for CRT dependencies"
diff --git a/cc/cc.go b/cc/cc.go
index 327af5e..3eaf9aa 100644
--- a/cc/cc.go
+++ b/cc/cc.go
@@ -2218,6 +2218,13 @@
if err != nil {
ctx.PropertyErrorf("min_sdk_version", err.Error())
}
+
+ // Raise the minSdkVersion to the minimum supported for the architecture.
+ minApiForArch := minApiForArch(ctx, m.Target().Arch.ArchType)
+ if apiLevel.LessThan(minApiForArch) {
+ apiLevel = minApiForArch
+ }
+
return []blueprint.Variation{
{Mutator: "sdk", Variation: "sdk"},
{Mutator: "version", Variation: apiLevel.String()},