Merge "Interpret CRT object's min_sdk_version with ApiLevel" am: 7f6e057f23
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1730110 Change-Id: I1e2f8d02978775d5997b6b569538491257873223
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" {
|
||||
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{
|
||||
|
Reference in New Issue
Block a user