Add api35-36-j17-21-23-ndk26-emu-api35 variant

rinekri · rinekri · commit 5d77f71a1ae4 · 2026-04-22T20:25:50.000+01:00
diff --git a/README.md b/README.md
@@ -19,6 +19,7 @@ All image variants are defined in `variants.json` and released by Git tag.
 | `api34-35-j23-corretto` | `23.04` | `linux/amd64` | `java-23-amazon-corretto` | `34,35` | `-` | `-` |
 | `api35-36-j17-23` | `23.04` | `linux/amd64` | `java-23-amazon-corretto` | `35,36` | `-` | `-` |
 | `api35-36-j17-23-ndk29-u24-gcc14` | `24.04` | `linux/amd64` | `java-23-amazon-corretto` | `35,36` | `ndk 29.0.14033849`, `cmake 4.1.1` | `python2`, `gcc14` |
+| `api35-36-j17-21-23-ndk26-emu-api35` | `23.04` | `linux/amd64` | `java-23-amazon-corretto` | `35,36` (+ `system-image 35`) | `ndk 26.2.11394342`, `cmake 3.18.1/3.22.1` | `python2`, `emulator`, `marathon 0.10.1` |
 
 ## Release By Git Tag
 
@@ -111,6 +112,7 @@ Multi-JDK variants:
 | `api34-35-j17-23-ndk26` | `openjdk-17-jdk`, `java-23-amazon-corretto-jdk` | `java-23-amazon-corretto` | `update-java-alternatives --set java-1.17.0-openjdk-amd64` |
 | `api35-36-j17-23` | `openjdk-17-jdk`, `java-23-amazon-corretto-jdk` | `java-23-amazon-corretto` | `update-java-alternatives --set java-1.17.0-openjdk-amd64` |
 | `api35-36-j17-23-ndk29-u24-gcc14` | `openjdk-17-jdk`, `java-23-amazon-corretto-jdk` | `java-23-amazon-corretto` | `update-java-alternatives --set java-1.17.0-openjdk-amd64` |
+| `api35-36-j17-21-23-ndk26-emu-api35` | `openjdk-17-jdk`, `java-21-amazon-corretto-jdk`, `java-23-amazon-corretto-jdk` | `java-23-amazon-corretto` | `update-java-alternatives --set java-21-amazon-corretto`, `update-java-alternatives --set java-1.17.0-openjdk-amd64` |
 
 ## Local Validation
 
diff --git a/scripts/validate-variants.sh b/scripts/validate-variants.sh
@@ -24,6 +24,7 @@ expected_ids_json='[
   "api34-35-j17-23-ndk26",
   "api34-35-j23-corretto",
   "api34-35-j23-openjdk",
+  "api35-36-j17-21-23-ndk26-emu-api35",
   "api35-36-j17-23",
   "api35-36-j17-23-ndk29-u24-gcc14"
 ]'
diff --git a/variants.json b/variants.json
@@ -610,6 +610,78 @@
         },
         "marathon_version": "0.10.1"
       }
+    },
+    "api35-36-j17-21-23-ndk26-emu-api35": {
+      "platforms": [
+        "linux/amd64"
+      ],
+      "docker": {
+        "ubuntu": "23.04",
+        "apt_profile": "ubuntu23_old_releases",
+        "apt_packages": [
+          "sudo",
+          "rsync",
+          "openjdk-17-jdk",
+          "java-21-amazon-corretto-jdk",
+          "java-23-amazon-corretto-jdk",
+          "curl",
+          "expect",
+          "git",
+          "git-lfs",
+          "libc6:i386",
+          "libncurses5:i386",
+          "libstdc++6:i386",
+          "zlib1g:i386",
+          "wget",
+          "unzip",
+          "vim",
+          "jq",
+          "net-tools",
+          "socat",
+          "libglu1",
+          "libpulse0",
+          "libx11-6",
+          "libxcb1",
+          "libxdamage1",
+          "libnss3",
+          "libxcomposite1",
+          "libxcursor1",
+          "libxi6",
+          "libxext6",
+          "libxfixes3",
+          "lib32stdc++6",
+          "ccache",
+          "g++",
+          "gcc",
+          "make",
+          "openssl"
+        ],
+        "java_default": "java-23-amazon-corretto",
+        "sdk_packages": [
+          "tools",
+          "cmdline-tools;latest",
+          "emulator",
+          "build-tools;34.0.0",
+          "build-tools;35.0.0",
+          "build-tools;35.0.1",
+          "build-tools;36.0.0",
+          "platform-tools",
+          "platforms;android-35",
+          "platforms;android-36",
+          "system-images;android-35;google_apis;x86_64",
+          "cmake;3.18.1",
+          "cmake;3.22.1",
+          "ndk;26.2.11394342"
+        ],
+        "features": {
+          "profiler": false,
+          "python2": true,
+          "gcc14": false,
+          "emulator": true,
+          "marathon": true
+        },
+        "marathon_version": "0.10.1"
+      }
     }
   }
 }
