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

Merge "Convert requested SDK version if preview API level" into main

Browse Source
This commit is contained in:
Treehugger Robot
2023-07-19 20:05:05 +00:00
committed by Gerrit Code Review
parent 958ca02582 6dcbd9c239
commit 12a1f9182d
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cc/cc.go
View File

@@ -2950,20 +2950,20 @@ func checkLinkType(ctx android.BaseModuleContext, from LinkableInterface, to Lin
ctx.ModuleErrorf("links %q built against newer API version %q", ctx.ModuleErrorf("links %q built against newer API version %q",
ctx.OtherModuleName(to.Module()), "current") ctx.OtherModuleName(to.Module()), "current")
} else { } else {
fromApi, err := strconv.Atoi(from.SdkVersion()) fromApi, err := android.ApiLevelFromUserWithConfig(ctx.Config(), from.SdkVersion())
if err != nil { if err != nil {
ctx.PropertyErrorf("sdk_version", ctx.PropertyErrorf("sdk_version",
"Invalid sdk_version value (must be int or current): %q", "Invalid sdk_version value (must be int, preview or current): %q",
from.SdkVersion()) from.SdkVersion())
} }
toApi, err := strconv.Atoi(to.SdkVersion()) toApi, err := android.ApiLevelFromUserWithConfig(ctx.Config(), to.SdkVersion())
if err != nil { if err != nil {
ctx.PropertyErrorf("sdk_version", ctx.PropertyErrorf("sdk_version",
"Invalid sdk_version value (must be int or current): %q", "Invalid sdk_version value (must be int, preview or current): %q",
to.SdkVersion()) to.SdkVersion())
} }
if toApi > fromApi { if toApi.GreaterThan(fromApi) {
ctx.ModuleErrorf("links %q built against newer API version %q", ctx.ModuleErrorf("links %q built against newer API version %q",
ctx.OtherModuleName(to.Module()), to.SdkVersion()) ctx.OtherModuleName(to.Module()), to.SdkVersion())
} }