From: Alessandro Astone <ales.astone@gmail.com>
Date: Sun, 26 Jan 2025 14:53:01 +0000 (+0100)
Subject: initializer: Differentiate HALIUM vndk31 and vndk32
X-Git-Tag: 1.5.0~5
X-Git-Url: https://glassweightruler.freedombox.rocks/gitweb/waydroid.git/commitdiff_plain/d3f4c8c218e017b29b416d9eb7540bee8b5c99d0

initializer: Differentiate HALIUM vndk31 and vndk32

HALIUM 12 may refer to either vndk31 or vndk32.
We need to differentiate the two.
Use HALIUM_12 for vndk31 and HALIUM_12L for vndk32.
---

diff --git a/tools/actions/initializer.py b/tools/actions/initializer.py
index 8725097..fdf67a3 100644
--- a/tools/actions/initializer.py
+++ b/tools/actions/initializer.py
@@ -23,10 +23,13 @@ def get_vendor_type(args):
     ret = "MAINLINE"
     if vndk_str != "":
         vndk = int(vndk_str)
-        if vndk > 31:
-            vndk -= 1 # 12L -> Halium 12
         if vndk > 19:
-            ret = "HALIUM_" + str(vndk - 19)
+            halium_ver = vndk - 19
+            if vndk > 31:
+                halium_ver -= 1 # 12L -> Halium 12
+            ret = "HALIUM_" + str(halium_ver)
+            if vndk == 32:
+                ret += "L"
 
     return ret