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 am: 12a1f9182d am: 11bc03a14f

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

Change-Id: I6d020e20ecd5a6ede0a99f9777689ea17a58268c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-07-19 21:26:36 +00:00
committed by Automerger Merge Worker
parent 3c796cf5fd 11bc03a14f
commit 0af5b13bad
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.OtherModuleName(to.Module()), "current")
} else {
fromApi, err := strconv.Atoi(from.SdkVersion())
fromApi, err := android.ApiLevelFromUserWithConfig(ctx.Config(), from.SdkVersion())
if err != nil {
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())
}
toApi, err := strconv.Atoi(to.SdkVersion())
toApi, err := android.ApiLevelFromUserWithConfig(ctx.Config(), to.SdkVersion())
if err != nil {
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())
}
if toApi > fromApi {
if toApi.GreaterThan(fromApi) {
ctx.ModuleErrorf("links %q built against newer API version %q",
ctx.OtherModuleName(to.Module()), to.SdkVersion())
}