Add android-channel, android-profile, android-target, and android-cores inputs

Author: marcprux

README.md

@@ -63,6 +63,15 @@ jobs:
           swift-version: 6.0.3
 ```
 
+### Swift Versions
+
+The `swift-version` input can be set to a specific version number (e.g., "6.0.3" or "6.1.1").
+A shortened version like "6.0" or "6.1" will use the latest [release](https://github.com/skiptools/swift-android-toolchain/releases),
+which may be a pre-release build.
+
+Snapshots can be specified with their full name, like "6.1-DEVELOPMENT-SNAPSHOT-2025-03-07-a".
+
+
 ### Configuration Options
 
 | Parameter | Description | Default  |
@@ -79,6 +88,10 @@ jobs:
 | copy-files | Additional files to copy to emulator for testing | |
 | android-emulator-test-folder | Emulator folder where tests are copied and run | /data/local/tmp/android-xctest |
 | android-api-level | The API level of the Android emulator to run against | 29 |
+| android-channel | Channel to download the SDK components from - stable, beta, dev, canary | canary |
+| android-profile | Hardware profile used for creating the AVD | pixel |
+| android-target | Target of the system image - default, google_apis, playstore, android-wear, android-wear-cn, android-tv, google-tv, aosp_atd or google_atd | aosp_atd |
+| android-cores | Number of cores to use for the emulator | 2 |
 | android-emulator-options | Options to pass to the Android emulator | -no-window … |
 | android-emulator-boot-timeout | Emulator boot timeout in seconds | 600 |
 

action.yml

@@ -70,10 +70,26 @@ inputs:
     description: 'Additional files to copy to emulator for testing'
     required: true
     default: ''
+  android-cores:
+    description: 'Number of cores to use for the emulator'
+    required: true
+    default: 2
   android-api-level:
     description: 'The API level of the Android emulator to run against'
     required: true
     default: 29
+  android-channel:
+    required: false
+    type: string
+    default: 'canary'
+  android-profile:
+    required: false
+    type: string
+    default: 'pixel'
+  android-target:
+    required: false
+    type: string
+    default: 'aosp_atd'
 
 runs:
   using: "composite"
@@ -369,14 +385,18 @@ runs:
         path: |
           ~/.android/avd/*
           ~/.android/adb*
-        key: avd-${{ inputs.android-api-level }}-${{ steps.setup.outputs.android-emulator-arch }}
+        key: 'avd-${{ inputs.android-profile }}_${{ inputs.android-channel }}_${{ inputs.android-target }}_${{ inputs.android-api-level }}-${{ steps.setup.outputs.android-emulator-arch }}'
 
     - name: Create Android Emulator Cache
       if: ${{ inputs.run-tests == 'true' && inputs.build-tests == 'true' && inputs.build-package == 'true' && steps.avd-cache.outputs.cache-hit != 'true' }}
       uses: reactivecircus/android-emulator-runner@v2
       with:
         force-avd-creation: false
         api-level: ${{ inputs.android-api-level }}
+        target: ${{ inputs.android-target }}
+        channel: ${{ inputs.android-channel }}
+        profile: ${{ inputs.android-profile }}
+        cores: ${{ inputs.android-cores }}
         emulator-boot-timeout: ${{ inputs.android-emulator-boot-timeout }}
         emulator-options: ${{ inputs.android-emulator-options }}
         arch: ${{ steps.setup.outputs.android-emulator-arch }}
@@ -390,6 +410,10 @@ runs:
       with:
         force-avd-creation: false
         api-level: ${{ inputs.android-api-level }}
+        target: ${{ inputs.android-target }}
+        channel: ${{ inputs.android-channel }}
+        profile: ${{ inputs.android-profile }}
+        cores: ${{ inputs.android-cores }}
         emulator-boot-timeout: ${{ inputs.android-emulator-boot-timeout }}
         emulator-options: -no-snapshot-save ${{ inputs.android-emulator-options }}
         arch: ${{ steps.setup.outputs.android-emulator-arch }}