Allow increasing main storage size (sdcard is separate storage)

README.md

@@ -149,6 +149,7 @@ jobs:
 | `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` |
 | `sdcard-path-or-size` | Optional | N/A | Path to the SD card image for this AVD or the size of a new SD card image to create for this AVD, in KB or MB, denoted with K or M. - e.g. `path/to/sdcard`, or `1000M`. |
+| `disk-size` | Optional | N/A | Disk size to use for this AVD. Either in bytes or KB, MB or GB, when denoted with K, M or G. - e.g. `2048M` |
 | `avd-name` | Optional | `test` | Custom AVD name used for creating the Android Virtual Device. |
 | `force-avd-creation` | Optional | `true` | Whether to force create the AVD by overwriting an existing AVD with the same name as `avd-name` - `true` or `false`. |
 | `emulator-options` | Optional | See below | Command-line options used when launching the emulator (replacing all default options) - e.g. `-no-window -no-snapshot -camera-back emulated`. |

action.yml

@@ -23,6 +23,8 @@ inputs:
     description: 'size of RAM to use for this AVD, in KB or MB, denoted with K or M. - e.g. `2048M`'
   sdcard-path-or-size:
     description: 'path to the SD card image for this AVD or the size of a new SD card image to create for this AVD, in KB or MB, denoted with K or M. - e.g. `path/to/sdcard`, or `1000M`'
+  disk-size:
+    description: 'disk size to use for this AVD. Either in bytes or KB, MB or GB, when denoted with K, M or G'
   avd-name:
     description: 'custom AVD name used for creating the Android Virtual Device'
     default: 'test'

src/emulator-manager.ts

@@ -14,6 +14,7 @@ export async function launchEmulator(
   cores: string,
   ramSize: string,
   sdcardPathOrSize: string,
+  diskSize: string,
   avdName: string,
   forceAvdCreation: boolean,
   emulatorOptions: string,
@@ -45,6 +46,10 @@ export async function launchEmulator(
     await exec.exec(`sh -c \\"printf 'hw.keyboard=yes\n' >> ${process.env.ANDROID_AVD_HOME}/"${avdName}".avd"/config.ini`);
   }
 
+  if (diskSize) {
+    await exec.exec(`sh -c \\"printf 'disk.dataPartition.size=${diskSize}\n' >> ${process.env.ANDROID_AVD_HOME}/"${avdName}".avd"/config.ini`);
+  }
+
   //turn off hardware acceleration on Linux
   if (process.platform === 'linux' && disableLinuxHardwareAcceleration) {
     console.log('Disabling Linux hardware acceleration.');

src/input-validator.ts

@@ -69,3 +69,20 @@ export function checkEmulatorBuild(emulatorBuild: string): void {
 function isValidBoolean(value: string): boolean {
   return value === 'true' || value === 'false';
 }
+
+export function checkDiskSize(diskSize: string): void {
+  // Disk size can be empty - the default value
+  if (diskSize) {
+    // Can also be number of bytes
+    if (isNaN(Number(diskSize)) || !Number.isInteger(Number(diskSize))) {
+      // Disk size can have a size multiplier at the end K, M or G
+      const diskSizeUpperCase = diskSize.toUpperCase();
+      if (diskSizeUpperCase.endsWith('K') || diskSizeUpperCase.endsWith('M') || diskSizeUpperCase.endsWith('G')) {
+        const diskSizeNoModifier: string = diskSize.slice(0, -1);
+        if (isNaN(Number(diskSizeNoModifier)) || !Number.isInteger(Number(diskSizeNoModifier))) {
+          throw new Error(`Unexpected disk size: '${diskSize}'.`);
+        }
+      }
+    }
+  }
+}

src/main.ts

@@ -10,7 +10,8 @@ import {
   checkDisableLinuxHardwareAcceleration,
   checkForceAvdCreation,
   checkChannel,
-  checkEnableHardwareKeyboard
+  checkEnableHardwareKeyboard,
+  checkDiskSize
 } from './input-validator';
 import { launchEmulator, killEmulator } from './emulator-manager';
 import * as exec from '@actions/exec';
@@ -63,6 +64,10 @@ async function run() {
     const sdcardPathOrSize = core.getInput('sdcard-path-or-size');
     console.log(`SD card path or size: ${sdcardPathOrSize}`);
 
+    const diskSize = core.getInput('disk-size');
+    checkDiskSize(diskSize);
+    console.log(`Disk size: ${diskSize}`);
+
     // custom name used for creating the AVD
     const avdName = core.getInput('avd-name');
     console.log(`AVD name: ${avdName}`);
@@ -156,6 +161,7 @@ async function run() {
       cores,
       ramSize,
       sdcardPathOrSize,
+      diskSize,
       avdName,
       forceAvdCreation,
       emulatorOptions,