Interpret CRT object's min_sdk_version with ApiLevel
min_sdk_version values should be interpreted before use. Bug: n/a Test: m (in REL) Change-Id: Ia45f5c7aeb4efcd8daef1deaf54f333dcdd1379d
This commit is contained in:
6
cc/cc.go
6
cc/cc.go
@@ -1970,9 +1970,13 @@ func GetCrtVariations(ctx android.BottomUpMutatorContext,
|
|||||||
if minSdkVersion == "" || minSdkVersion == "apex_inherit" {
|
if minSdkVersion == "" || minSdkVersion == "apex_inherit" {
|
||||||
minSdkVersion = m.SdkVersion()
|
minSdkVersion = m.SdkVersion()
|
||||||
}
|
}
|
||||||
|
apiLevel, err := android.ApiLevelFromUser(ctx, minSdkVersion)
|
||||||
|
if err != nil {
|
||||||
|
ctx.PropertyErrorf("min_sdk_version", err.Error())
|
||||||
|
}
|
||||||
return []blueprint.Variation{
|
return []blueprint.Variation{
|
||||||
{Mutator: "sdk", Variation: "sdk"},
|
{Mutator: "sdk", Variation: "sdk"},
|
||||||
{Mutator: "version", Variation: minSdkVersion},
|
{Mutator: "version", Variation: apiLevel.String()},
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return []blueprint.Variation{
|
return []blueprint.Variation{
|
||||||
|
Reference in New Issue
Block a user