Merge changes from topic "reland-hack-rv64-libc++" into main am: db195fd4cb am: 83290c0614 am: cd520ba878 am: dee3bad259

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

Change-Id: Icdb0ff2934e65de2cf31d3d787d6f1412f4e6bba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-07-27 21:29:24 +00:00
committed by Automerger Merge Worker

View File

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