From e2ef90a064ac0118fb37457f2fe93deaba2b9fa4 Mon Sep 17 00:00:00 2001 From: hmelder Date: Sat, 20 Jul 2024 18:29:21 +0200 Subject: [PATCH] Support armeabi-v7a --- .github/workflows/manually.yml | 2 +- README.md | 2 +- action-types.yml | 1 + action.yml | 2 +- lib/input-validator.js | 2 +- src/input-validator.ts | 2 +- 6 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/manually.yml b/.github/workflows/manually.yml index 9b8f9722a..f0bf02b1d 100644 --- a/.github/workflows/manually.yml +++ b/.github/workflows/manually.yml @@ -15,7 +15,7 @@ on: required: true default: 'default' arch: - description: 'CPU architecture of the system image - x86, x86_64 or arm64-v8a' + description: 'CPU architecture of the system image - x86, x86_64, armeabi-v7a, or arm64-v8a' default: 'x86' emulator-options: description: 'command-line options used when launching the emulator' diff --git a/README.md b/README.md index f245ff388..bf6c40e86 100644 --- a/README.md +++ b/README.md @@ -180,7 +180,7 @@ jobs: | **Input** | **Required** | **Default** | **Description** | |-|-|-|-| | `api-level` | Required | N/A | API level of the platform system image - e.g. 23 for Android Marshmallow, 29 for Android 10. **Minimum API level supported is 15**. | -| `target` | Optional | `default` | Target of the system image - `default`, `google_apis`, `playstore`, `android-wear`, `android-wear-cn`, `android-tv`, `google-tv`, `aosp_atd` or `google_atd`. Note that `aosp_atd` and `google_atd` currently require the following: `api-level: 30`, `arch: x86` or `arch: arm64-v8` and `channel: canary`. | +| `target` | Optional | `default` | Target of the system image - `default`, `google_apis`, `playstore`, `android-wear`, `android-wear-cn`, `android-tv`, `google-tv`, `aosp_atd` or `google_atd`. Note that `aosp_atd` and `google_atd` currently require the following: `api-level: 30`, `arch: x86`, `armeabi-v7a`, or `arch: arm64-v8` and `channel: canary`. | | `arch` | Optional | `x86` | CPU architecture of the system image - `x86`, `x86_64` or `arm64-v8a`. Note that `x86_64` image is only available for API 21+. `arm64-v8a` images require Android 4.2+ and are limited to fewer API levels (e.g. 30). | | `profile` | Optional | N/A | Hardware profile used for creating the AVD - e.g. `Nexus 6`. For a list of all profiles available, run `avdmanager list device`. | | `cores` | Optional | 2 | Number of cores to use for the emulator (`hw.cpu.ncore` in config.ini). | diff --git a/action-types.yml b/action-types.yml index b77d4b11d..0402ba84c 100644 --- a/action-types.yml +++ b/action-types.yml @@ -19,6 +19,7 @@ inputs: - x86 - x86_64 - arm64-v8a + - armeabi-v7a profile: type: string cores: diff --git a/action.yml b/action.yml index fa60d74dd..da6bbf0c0 100644 --- a/action.yml +++ b/action.yml @@ -12,7 +12,7 @@ inputs: description: 'target of the system image - default, google_apis, google_apis_playstore, aosp_atd, google_atd, android-wear, android-wear-cn, android-tv or google-tv' default: 'default' arch: - description: 'CPU architecture of the system image - x86, x86_64 or arm64-v8a' + description: 'CPU architecture of the system image - x86, x86_64, armeabi-v7a, or arm64-v8a' default: 'x86' profile: description: 'hardware profile used for creating the AVD - e.g. `Nexus 6`' diff --git a/lib/input-validator.js b/lib/input-validator.js index c27593be7..93e6ca7f7 100644 --- a/lib/input-validator.js +++ b/lib/input-validator.js @@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); exports.checkDiskSize = exports.checkEmulatorBuild = exports.checkEnableHardwareKeyboard = exports.checkDisableLinuxHardwareAcceleration = exports.checkDisableSpellchecker = exports.checkDisableAnimations = exports.checkPort = exports.checkForceAvdCreation = exports.checkChannel = exports.checkArch = exports.checkTarget = exports.checkApiLevel = exports.PREVIEW_API_LEVELS = exports.MAX_PORT = exports.MIN_PORT = exports.VALID_CHANNELS = exports.VALID_ARCHS = exports.VALID_TARGETS = exports.MIN_API_LEVEL = void 0; exports.MIN_API_LEVEL = 15; exports.VALID_TARGETS = ['default', 'google_apis', 'aosp_atd', 'google_atd', 'google_apis_playstore', 'android-wear', 'android-wear-cn', 'android-tv', 'google-tv']; -exports.VALID_ARCHS = ['x86', 'x86_64', 'arm64-v8a']; +exports.VALID_ARCHS = ['x86', 'x86_64', 'arm64-v8a', 'armeabi-v7a']; exports.VALID_CHANNELS = ['stable', 'beta', 'dev', 'canary']; exports.MIN_PORT = 5554; exports.MAX_PORT = 5584; diff --git a/src/input-validator.ts b/src/input-validator.ts index 8804685ea..4f748db7e 100644 --- a/src/input-validator.ts +++ b/src/input-validator.ts @@ -1,6 +1,6 @@ export const MIN_API_LEVEL = 15; export const VALID_TARGETS: Array = ['default', 'google_apis', 'aosp_atd', 'google_atd', 'google_apis_playstore', 'android-wear', 'android-wear-cn', 'android-tv', 'google-tv']; -export const VALID_ARCHS: Array = ['x86', 'x86_64', 'arm64-v8a']; +export const VALID_ARCHS: Array = ['x86', 'x86_64', 'arm64-v8a', 'armeabi-v7a']; export const VALID_CHANNELS: Array = ['stable', 'beta', 'dev', 'canary']; export const MIN_PORT = 5554; export const MAX_PORT = 5584;