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

Merge changes from topic "hack-rv64-libc++" into main

Browse Source 
* changes:
  Use prebuilt NDK libc++ for rv64.
  Set VIC as minimum SDK version for riscv64
This commit is contained in:
Treehugger Robot
2023-07-26 01:09:19 +00:00
committed by Gerrit Code Review
parent 06c246c1af 5757c0cf9a
commit 5dbed51365
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cc/api_level.go
View File

@@ -31,7 +31,11 @@ func MinApiForArch(ctx android.EarlyModuleContext,
case android.Arm64, android.X86_64: case android.Arm64, android.X86_64:
return android.FirstLp64Version return android.FirstLp64Version
case android.Riscv64: case android.Riscv64:
return android.FutureApiLevel apiLevel, err := android.ApiLevelFromUser(ctx, "VanillaIceCream")
if err != nil {
panic(err)
}
return apiLevel
default: default:
panic(fmt.Errorf("Unknown arch %q", arch)) panic(fmt.Errorf("Unknown arch %q", arch))
} }

3
cc/stl.go
View File

@@ -80,8 +80,7 @@ func (stl *stl) begin(ctx BaseModuleContext) {
return "" return ""
} }
s = deduplicateStlInput(s) s = deduplicateStlInput(s)
archHasNDKStl := ctx.Arch().ArchType != android.Riscv64 if ctx.useSdk() && ctx.Device() {
if ctx.useSdk() && ctx.Device() && archHasNDKStl {
switch s { switch s {
case "", "system": case "", "system":
return "ndk_system" return "ndk_system"