tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Convert preview sdkVersion to int for target-api

Browse source 
If the target SDK of the module is a preview, the current logic passes
it through to llvm-rs-cc, which expects an int. Convert codenames to
their API level first, then extract the final or preview int.

Also simplify the logic to look for 'current' more generically via the
common ApiLevel library functions.

Test: Verified local build of riscv64, confirmed RS attempts to build
with API level 9000+ instead of 'VanillaIceCream'.

Change-Id: I1fa7577181bfd16de0ea4e77f7ab8fbd8fdb55e5
This commit is contained in:
Prashanth Swaminathan 2023-07-28 13:09:37 -07:00
parent 6ff7d9e532
commit 30f7c79949
1 changed files with 6 additions and 5 deletions
Show stats 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()
} }
} }