From 9e4f3b5dd2a51022542e81e3f0d644f47c1f046e Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Mon, 21 Oct 2024 18:11:07 +0000
Subject: Update riscv64 minimum API level to FutureApiLevel

The Baklava codename is being added, so the minimum riscv64 API level
needs to be updated from VanillaIceCream to Baklava.  Unfortunately,
TARGET_RELEASE=next builds don't have the Baklava codename defined,
so use FutureApiLevel for now.

Bug: 374457207
Test: builds
Flag: EXEMPT bugfix
Ignore-AOSP-First: Baklava isn't in AOSP yet
Change-Id: I2f9969b96a88a9b86bcf4bb0acaa0b1f7f3735a5
---
 cc/api_level.go | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'cc')

diff --git a/cc/api_level.go b/cc/api_level.go
index 69a0d3ae4..a5571f31f 100644
--- a/cc/api_level.go
+++ b/cc/api_level.go
@@ -31,11 +31,7 @@ func MinApiForArch(ctx android.EarlyModuleContext,
 	case android.Arm64, android.X86_64:
 		return android.FirstLp64Version
 	case android.Riscv64:
-		apiLevel, err := android.ApiLevelFromUser(ctx, "VanillaIceCream")
-		if err != nil {
-			panic(err)
-		}
-		return apiLevel
+		return android.FutureApiLevel
 	default:
 		panic(fmt.Errorf("Unknown arch %q", arch))
 	}
-- 
cgit v1.2.3-59-g8ed1b