[green] Upsert deterministic Android AVD settings

Signed-off-by: Viwat Vchirawongkwin <viwat.v@chula.ac.th>

Author: yyods

.github/workflows/ci.yml

@@ -309,18 +309,19 @@ jobs:
           # 1280x800 logical tablet surface, matching the Android test geometry.
           # Keep userdata at 2 GiB so the complete API 34 image fits the hosted
           # runner after its pinned SDK, build-tools, and NDK are installed.
-          printf '%s\n' \
-            'hw.ramSize=3072' \
-            'hw.cpu.ncore=2' \
-            'vm.heapSize=512' \
-            'disk.dataPartition.size=2048M' \
-            'hw.lcd.width=2560' \
-            'hw.lcd.height=1600' \
-            'hw.lcd.density=320' \
-            'hw.initialOrientation=landscape' \
-            'hw.gpu.enabled=yes' \
-            'hw.gpu.mode=swiftshader_indirect' \
-            >> "$AVD_CONFIG"
+          # avdmanager pre-populates these keys. Upsert them so the emulator
+          # cannot select an earlier device-profile value from a duplicate.
+          python3 ../tools/ci/android_avd_config.py "$AVD_CONFIG" \
+            --set 'hw.ramSize=3072' \
+            --set 'hw.cpu.ncore=2' \
+            --set 'vm.heapSize=512' \
+            --set 'disk.dataPartition.size=2048M' \
+            --set 'hw.lcd.width=2560' \
+            --set 'hw.lcd.height=1600' \
+            --set 'hw.lcd.density=320' \
+            --set 'hw.initialOrientation=landscape' \
+            --set 'hw.gpu.enabled=yes' \
+            --set 'hw.gpu.mode=swiftshader_indirect'
       - name: Boot headless emulator (KVM + software GPU)
         shell: bash
         run: |

tools/ci/android_avd_config.py

@@ -0,0 +1,74 @@
+#!/usr/bin/env python3
+# SPDX-License-Identifier: MIT
+# Part of PyBLE (https://pyble.dev) — see /LICENSE.
+"""Apply deterministic, duplicate-free Android AVD configuration overrides."""
+
+from __future__ import annotations
+
+import argparse
+import re
+from collections.abc import Sequence
+from pathlib import Path
+
+VALID_KEY = re.compile(r"[A-Za-z0-9][A-Za-z0-9._-]*")
+
+
+def _parse_overrides(assignments: Sequence[str]) -> list[tuple[str, str]]:
+    parsed: list[tuple[str, str]] = []
+    seen: set[str] = set()
+    for assignment in assignments:
+        key, separator, value = assignment.partition("=")
+        if (
+            not separator
+            or not VALID_KEY.fullmatch(key)
+            or not value
+            or "\n" in value
+            or "\r" in value
+        ):
+            raise ValueError(
+                f"override must be a single-line KEY=VALUE assignment: {assignment!r}"
+            )
+        if key in seen:
+            raise ValueError(f"duplicate requested override: {key}")
+        seen.add(key)
+        parsed.append((key, value))
+    return parsed
+
+
+def apply_overrides(config: Path, assignments: Sequence[str]) -> None:
+    """Replace all existing copies of each requested key with one canonical value."""
+    overrides = _parse_overrides(assignments)
+    controlled_keys = {key for key, _ in overrides}
+    retained: list[str] = []
+    for line in config.read_text(encoding="utf-8").splitlines():
+        candidate, separator, _ = line.partition("=")
+        if separator and candidate.strip() in controlled_keys:
+            continue
+        retained.append(line)
+
+    retained.extend(f"{key}={value}" for key, value in overrides)
+    config.write_text("\n".join(retained) + "\n", encoding="utf-8")
+
+
+def main() -> int:
+    parser = argparse.ArgumentParser(
+        description="Apply duplicate-free KEY=VALUE overrides to an AVD config.ini."
+    )
+    parser.add_argument("config", type=Path)
+    parser.add_argument(
+        "--set",
+        action="append",
+        dest="overrides",
+        required=True,
+        metavar="KEY=VALUE",
+    )
+    args = parser.parse_args()
+    try:
+        apply_overrides(args.config, args.overrides)
+    except (OSError, ValueError) as error:
+        parser.error(str(error))
+    return 0
+
+
+if __name__ == "__main__":
+    raise SystemExit(main())