Merge "Interpret CRT object's min_sdk_version with ApiLevel" into sc-dev
This commit is contained in:
commit
f8b55cd51e
6
cc/cc.go
6
cc/cc.go
|
@ -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{
|
||||
|
|
Loading…
Reference in New Issue