From 85f1481ba31058f7d7bf02efe206aa12692f4b75 Mon Sep 17 00:00:00 2001
From: Marc Rousavy <me@mrousavy.com>
Date: Sat, 5 Sep 2026 15:58:55 +0300
Subject: [PATCH] fix: Run legacy Android ASan on API 33

---
 .github/workflows/harness-android.yml | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/harness-android.yml b/.github/workflows/harness-android.yml
index 0391f2535..d1f752bef 100644
--- a/.github/workflows/harness-android.yml
+++ b/.github/workflows/harness-android.yml
@@ -8,9 +8,8 @@ on:
   workflow_dispatch:
     inputs:
       device_api_level:
-        description: "Android API level for the emulator"
+        description: "Override the Android API level for both jobs"
         required: false
-        default: "36"
         type: string
       device_profile:
         description: "Device profile"
@@ -18,9 +17,8 @@ on:
         default: "pixel_7"
         type: string
       avd_name:
-        description: "AVD name"
+        description: "Override the AVD name for both jobs"
         required: false
-        default: "Pixel_7_API_36"
         type: string
   push:
     branches:
@@ -70,11 +68,8 @@ on:
       - "apps/example/rn-harness.config.mjs"
 
 env:
-  # Device configuration - can be overridden by workflow_dispatch inputs
-  DEVICE_API_LEVEL: ${{ github.event.inputs.device_api_level || '36' }}
   DEVICE_ARCH: x86_64
   DEVICE_PROFILE: ${{ github.event.inputs.device_profile || 'pixel_7' }}
-  AVD_NAME: ${{ github.event.inputs.avd_name || 'Pixel_7_API_36' }}
   AVD_DISK_SIZE: 1G
   AVD_HEAP_SIZE: 1G
 
@@ -90,8 +85,17 @@ jobs:
         sanitizer:
           - name: Default
             gradle_property: ""
+            device_api_level: "36"
+            avd_name: Pixel_7_API_36
           - name: ASan
             gradle_property: "address"
+            # Keep legacy x86_64 ASan on the API 33 image verified in #1530.
+            # HWASan requires ARM64; this workflow uses an x86_64 emulator.
+            device_api_level: "33"
+            avd_name: Pixel_7_API_33
+    env:
+      DEVICE_API_LEVEL: ${{ github.event.inputs.device_api_level || matrix.sanitizer.device_api_level }}
+      AVD_NAME: ${{ github.event.inputs.avd_name || matrix.sanitizer.avd_name }}
     steps:
       - uses: actions/checkout@v7
         with: