Merge "Interpret CRT object's min_sdk_version with ApiLevel" into sc-dev (f8b55cd5) · Commits · e / os / android_build_soong

cc/cc.go

+5 −1

Original line number	Diff line number	Diff line
		@@ -1971,9 +1971,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{