StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Interpret CRT object's min_sdk_version with ApiLevel" am: 7f6e057f23

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1730110

Change-Id: I1e2f8d02978775d5997b6b569538491257873223
This commit is contained in:
Jooyung Han
2021-06-09 00:30:26 +00:00
committed by Automerger Merge Worker
parent 88e79319fd 7f6e057f23
commit e6ef49cb51
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cc/cc.go
View File

@@ -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{