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

Merge "Convert preview sdkVersion to int for target-api" into main

Browse Source
This commit is contained in:
Prashanth Swaminathan
2023-08-01 01:40:16 +00:00
committed by Gerrit Code Review
parent 61a27f80cd 30f7c79949
commit 1e079dfdf2
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
cc/rs.go
View File

@@ -101,11 +101,12 @@ func rsGenerateCpp(ctx android.ModuleContext, rsFiles android.Paths, rsFlags str
func rsFlags(ctx ModuleContext, flags Flags, properties *BaseCompilerProperties) Flags { func rsFlags(ctx ModuleContext, flags Flags, properties *BaseCompilerProperties) Flags {
targetApi := String(properties.Renderscript.Target_api) targetApi := String(properties.Renderscript.Target_api)
if targetApi == "" && ctx.useSdk() { if targetApi == "" && ctx.useSdk() {
switch ctx.sdkVersion() { targetApiLevel := android.ApiLevelOrPanic(ctx, ctx.sdkVersion())
case "current", "system_current", "test_current": if targetApiLevel.IsCurrent() || targetApiLevel.IsPreview() {
// Nothing // If the target level is current or preview, leave the 'target-api' unset.
default: // This signals to llvm-rs-cc that the development API should be used.
targetApi = android.GetNumericSdkVersion(ctx.sdkVersion()) } else {
targetApi = targetApiLevel.String()
} }
} }