Add support for armeabi-v7a

licy183 · Feb 11, 2023 · af49492 · af49492
1 parent 8e947e5
commit af49492
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 5 deletions.
diff --git 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 arm64-v8a or armeabi-v7a'
  default: 'x86'
  emulator-options:
  description: 'command-line options used when launching the emulator'

diff --git a/README.md b/README.md
@@ -145,7 +145,7 @@ jobs:
 |-|-|-|-|
 | `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`. |
-| `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). |
+| `arch` | Optional | `x86` | CPU architecture of the system image - `x86`, `x86_64`, `arm64-v8a` or `armeabi-v7a`. 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). `armeabi-v7a` image is only available for Android 7.1.1 (API 25) or lower. |
 | `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). |
 | `ram-size` | Optional | N/A | Size of RAM to use for this AVD, in KB or MB, denoted with K or M. - e.g. `2048M` |

diff --git 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
@@ -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, arm64-v8a or armeabi-v7a'
  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
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.checkDiskSize = exports.checkEmulatorBuild = exports.checkEnableHardwareKeyboard = exports.checkDisableLinuxHardwareAcceleration = exports.checkDisableSpellchecker = exports.checkDisableAnimations = exports.checkForceAvdCreation = exports.checkChannel = exports.checkArch = exports.checkTarget = exports.checkApiLevel = 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'];
 function checkApiLevel(apiLevel) {
  if (apiLevel.startsWith('UpsideDownCake') || apiLevel === 'TiramisuPrivacySandbox')

diff --git 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<string> = ['default', 'google_apis', 'aosp_atd', 'google_atd', 'google_apis_playstore', 'android-wear', 'android-wear-cn', 'android-tv', 'google-tv'];
-export const VALID_ARCHS: Array<string> = ['x86', 'x86_64', 'arm64-v8a'];
+export const VALID_ARCHS: Array<string> = ['x86', 'x86_64', 'arm64-v8a', 'armeabi-v7a'];
 export const VALID_CHANNELS: Array<string> = ['stable', 'beta', 'dev', 'canary'];
 
 export function checkApiLevel(apiLevel: string): void {