@react-native-harness/platform-android 1.1.0-rc.3 → 1.1.0-rc.4

package/dist/__tests__/environment.test.js

@@ -1,10 +1,76 @@
 import { beforeEach, describe, expect, it, vi } from 'vitest';
-import { getAndroidSdkRoot, getAndroidSystemImagePackage, getDefaultUnixAndroidSdkRoot, getHostAndroidSystemImageArch, getRequiredAndroidSdkPackages, } from '../environment.js';
+import fs from 'node:fs';
+import os from 'node:os';
+import path from 'node:path';
+import { ensureAndroidAdbAvailable, ensureAndroidEmulatorAvailable, getAndroidSdkRoot, getAndroidSystemImagePackage, getDefaultUnixAndroidSdkRoot, getHostAndroidSystemImageArch, getRequiredAndroidSdkPackages, } from '../environment.js';
+import * as tools from '@react-native-harness/tools';
 describe('Android environment', () => {
     beforeEach(() => {
         vi.restoreAllMocks();
         vi.unstubAllEnvs();
     });
+    it('skips bootstrapping command-line tools when adb is already installed', async () => {
+        const sdkRoot = fs.mkdtempSync(path.join(os.tmpdir(), 'android-sdk-'));
+        const adbPath = path.join(sdkRoot, 'platform-tools', 'adb');
+        fs.mkdirSync(path.dirname(adbPath), { recursive: true });
+        fs.writeFileSync(adbPath, '');
+        const spawnSpy = vi.spyOn(tools, 'spawn');
+        await expect(ensureAndroidAdbAvailable({
+            env: { ANDROID_HOME: sdkRoot },
+        })).resolves.toBe(sdkRoot);
+        expect(spawnSpy).not.toHaveBeenCalled();
+        fs.rmSync(sdkRoot, { force: true, recursive: true });
+    });
+    it('installs only platform-tools when adb is missing', async () => {
+        const sdkRoot = fs.mkdtempSync(path.join(os.tmpdir(), 'android-sdk-'));
+        const sdkManagerDirectory = path.join(sdkRoot, 'cmdline-tools', 'latest', 'bin');
+        fs.mkdirSync(sdkManagerDirectory, { recursive: true });
+        fs.writeFileSync(path.join(sdkManagerDirectory, 'sdkmanager'), '');
+        fs.writeFileSync(path.join(sdkManagerDirectory, 'avdmanager'), '');
+        const spawnSpy = vi.spyOn(tools, 'spawn').mockImplementation((async (command, args) => {
+            if (command === 'bash' && typeof args?.[1] === 'string') {
+                const commandString = args[1];
+                if (commandString.includes('platform-tools')) {
+                    const adbPath = path.join(sdkRoot, 'platform-tools', 'adb');
+                    fs.mkdirSync(path.dirname(adbPath), { recursive: true });
+                    fs.writeFileSync(adbPath, '');
+                }
+            }
+            return {};
+        }));
+        await expect(ensureAndroidAdbAvailable({
+            env: { ANDROID_HOME: sdkRoot },
+        })).resolves.toBe(sdkRoot);
+        expect(spawnSpy).toHaveBeenCalledWith('bash', ['-lc', expect.stringContaining('platform-tools')], expect.any(Object));
+        expect(spawnSpy.mock.calls.some(([command, args]) => command === 'bash' &&
+            typeof args?.[1] === 'string' &&
+            args[1].includes('platform-tools') &&
+            args[1].includes('emulator'))).toBe(false);
+        fs.rmSync(sdkRoot, { force: true, recursive: true });
+    });
+    it('installs emulator only when emulator is missing', async () => {
+        const sdkRoot = fs.mkdtempSync(path.join(os.tmpdir(), 'android-sdk-'));
+        const sdkManagerDirectory = path.join(sdkRoot, 'cmdline-tools', 'latest', 'bin');
+        fs.mkdirSync(sdkManagerDirectory, { recursive: true });
+        fs.writeFileSync(path.join(sdkManagerDirectory, 'sdkmanager'), '');
+        fs.writeFileSync(path.join(sdkManagerDirectory, 'avdmanager'), '');
+        const spawnSpy = vi.spyOn(tools, 'spawn').mockImplementation((async (command, args) => {
+            if (command === 'bash' && typeof args?.[1] === 'string') {
+                const commandString = args[1];
+                if (commandString.includes('emulator')) {
+                    const emulatorPath = path.join(sdkRoot, 'emulator', 'emulator');
+                    fs.mkdirSync(path.dirname(emulatorPath), { recursive: true });
+                    fs.writeFileSync(emulatorPath, '');
+                }
+            }
+            return {};
+        }));
+        await expect(ensureAndroidEmulatorAvailable({
+            env: { ANDROID_HOME: sdkRoot },
+        })).resolves.toBe(sdkRoot);
+        expect(spawnSpy).toHaveBeenCalledWith('bash', ['-lc', expect.stringContaining('emulator')], expect.any(Object));
+        fs.rmSync(sdkRoot, { force: true, recursive: true });
+    });
     it('uses the default Unix SDK root when env vars are missing', () => {
         expect(getDefaultUnixAndroidSdkRoot({
             platform: 'darwin',

package/dist/__tests__/instance.test.js

@@ -54,7 +54,7 @@ describe('Android platform instance', () => {
             activityName: '.MainActivity',
         }, harnessConfig, init);
         await instance.dispose();
-        expect(ensureAndroidEmulatorEnvironment).toHaveBeenCalledWith(35);
+        expect(ensureAndroidEmulatorEnvironment).not.toHaveBeenCalled();
         expect(stopEmulator).not.toHaveBeenCalled();
     });
     it('creates and boots an emulator when missing and shuts it down on dispose', async () => {

package/dist/__tests__/targets.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=targets.test.d.ts.map

package/dist/__tests__/targets.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"targets.test.d.ts","sourceRoot":"","sources":["../../src/__tests__/targets.test.ts"],"names":[],"mappings":""}

package/dist/__tests__/targets.test.js

@@ -0,0 +1,49 @@
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+import { getRunTargets } from '../targets.js';
+import * as adb from '../adb.js';
+import * as environment from '../environment.js';
+describe('Android target discovery', () => {
+    beforeEach(() => {
+        vi.restoreAllMocks();
+        vi.unstubAllEnvs();
+    });
+    it('installs adb and emulator only for discovery', async () => {
+        const ensureAndroidAdbAvailable = vi
+            .spyOn(environment, 'ensureAndroidAdbAvailable')
+            .mockResolvedValue('/tmp/android-sdk');
+        const ensureAndroidEmulatorAvailable = vi
+            .spyOn(environment, 'ensureAndroidEmulatorAvailable')
+            .mockResolvedValue('/tmp/android-sdk');
+        vi.spyOn(adb, 'getAvds').mockResolvedValue(['Pixel_8_API_35']);
+        vi.spyOn(adb, 'getConnectedDevices').mockResolvedValue([
+            {
+                id: 'device-1',
+                manufacturer: 'Google',
+                model: 'Pixel 8',
+            },
+        ]);
+        await expect(getRunTargets()).resolves.toEqual([
+            {
+                type: 'emulator',
+                name: 'Pixel_8_API_35',
+                platform: 'android',
+                description: 'Android emulator',
+                device: {
+                    name: 'Pixel_8_API_35',
+                },
+            },
+            {
+                type: 'physical',
+                name: 'Google Pixel 8',
+                platform: 'android',
+                description: 'Physical device (device-1)',
+                device: {
+                    manufacturer: 'Google',
+                    model: 'Pixel 8',
+                },
+            },
+        ]);
+        expect(ensureAndroidAdbAvailable).toHaveBeenCalledTimes(1);
+        expect(ensureAndroidEmulatorAvailable).toHaveBeenCalledTimes(1);
+    });
+});

package/dist/adb.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"adb.d.ts","sourceRoot":"","sources":["../src/adb.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,uBAAuB,EAAE,MAAM,iCAAiC,CAAC;AAG/E,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAE9D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAW5C,OAAO,EAEL,KAAK,gBAAgB,EACtB,MAAM,uBAAuB,CAAC;AA2C/B,eAAO,MAAM,eAAe;iCAElB,MAAM,QACN,SAAS,MAAM,EAAE,KACtB,mBAAmB,CAAC,IAAI,EAAE,QAAQ,EAAE,QAAQ,CAAC;CAKjD,CAAC;AA0EF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,eAAO,MAAM,2BAA2B,GAAI,UAAU,MAAM,KAAG,MAAM,EAMpE,CAAC;AAEF,eAAO,MAAM,wBAAwB,GACnC,UAAU,MAAM,KACf,OAAO,CAAC,IAAI,CAEd,CAAC;AAEF,eAAO,MAAM,eAAe,GAC1B,UAAU,MAAM,EAChB,cAAc,MAAM,EACpB,UAAU,uBAAuB,KAChC,MAAM,EAoCR,CAAC;AAEF,eAAO,MAAM,cAAc,GACzB,OAAO,MAAM,EACb,UAAU,MAAM,KACf,OAAO,CAAC,OAAO,CAWjB,CAAC;AAEF,eAAO,MAAM,WAAW,GACtB,OAAO,MAAM,EACb,MAAM,MAAM,EACZ,WAAU,MAAa,KACtB,OAAO,CAAC,IAAI,CAQd,CAAC;AAEF,eAAO,MAAM,OAAO,GAClB,OAAO,MAAM,EACb,UAAU,MAAM,KACf,OAAO,CAAC,IAAI,CASd,CAAC;AAEF,eAAO,MAAM,QAAQ,GACnB,OAAO,MAAM,EACb,UAAU,MAAM,EAChB,cAAc,MAAM,EACpB,UAAU,uBAAuB,KAChC,OAAO,CAAC,IAAI,CAMd,CAAC;AAEF,eAAO,MAAM,YAAY,QAAa,OAAO,CAAC,MAAM,EAAE,CAOrD,CAAC;AAEF,eAAO,MAAM,eAAe,GAC1B,OAAO,MAAM,KACZ,OAAO,CAAC,MAAM,GAAG,IAAI,CASvB,CAAC;AAEF,eAAO,MAAM,gBAAgB,GAC3B,OAAO,MAAM,EACb,UAAU,MAAM,KACf,OAAO,CAAC,MAAM,GAAG,IAAI,CASvB,CAAC;AAMF,MAAM,MAAM,UAAU,GAAG;IACvB,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;CACtB,CAAC;AAEF,eAAO,MAAM,aAAa,GACxB,OAAO,MAAM,KACZ,OAAO,CAAC,UAAU,GAAG,IAAI,CAI3B,CAAC;AAEF,eAAO,MAAM,eAAe,GAAU,OAAO,MAAM,KAAG,OAAO,CAAC,OAAO,CAWpE,CAAC;AAEF,eAAO,MAAM,YAAY,GAAU,OAAO,MAAM,KAAG,OAAO,CAAC,IAAI,CAE9D,CAAC;AAEF,eAAO,MAAM,UAAU,GACrB,OAAO,MAAM,EACb,SAAS,MAAM,KACd,OAAO,CAAC,IAAI,CAEd,CAAC;AAEF,eAAO,MAAM,MAAM,GAAU,MAAM,MAAM,KAAG,OAAO,CAAC,OAAO,CAG1D,CAAC;AAEF,eAAO,MAAM,SAAS,GAAU,kDAM7B,gBAAgB,KAAG,OAAO,CAAC,IAAI,CAiBjC,CAAC;AAEF,eAAO,MAAM,SAAS,GAAU,MAAM,MAAM,KAAG,OAAO,CAAC,IAAI,CAkB1D,CAAC;AAEF,eAAO,MAAM,aAAa,GACxB,MAAM,MAAM,EACZ,OAAM,gBAAiC,KACtC,OAAO,CAAC,IAAI,CAgFd,CAAC;AAEF,eAAO,MAAM,eAAe,GAC1B,MAAM,MAAM,EACZ,QAAQ,WAAW,KAClB,OAAO,CAAC,MAAM,CAoBhB,CAAC;AAEF,eAAO,MAAM,yBAAyB,GACpC,OAAO,MAAM,EACb,QAAQ,WAAW,KAClB,OAAO,CAAC,IAAI,CAYd,CAAC;AAEF,eAAO,MAAM,WAAW,GACtB,MAAM,MAAM,EACZ,QAAQ,WAAW,KAClB,OAAO,CAAC,MAAM,CAwBhB,CAAC;AAEF,eAAO,MAAM,YAAY,GACvB,OAAO,MAAM,EACb,UAAU,MAAM,KACf,OAAO,CAAC,OAAO,CAiBjB,CAAC;AAEF,eAAO,MAAM,SAAS,GACpB,OAAO,MAAM,EACb,UAAU,MAAM,KACf,OAAO,CAAC,MAAM,CAoBhB,CAAC;AAEF,eAAO,MAAM,mBAAmB,GAC9B,OAAO,MAAM,EACb,MAAM,OAAO,KACZ,OAAO,CAAC,IAAI,CAWd,CAAC;AAEF,eAAO,MAAM,kBAAkB,GAAU,OAAO,MAAM,KAAG,OAAO,CAAC,MAAM,CAUtE,CAAC;AAEF,eAAO,MAAM,OAAO,QAAa,OAAO,CAAC,MAAM,EAAE,CAWhD,CAAC;AAEF,MAAM,MAAM,SAAS,GAAG;IACtB,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;IACd,YAAY,EAAE,MAAM,CAAC;CACtB,CAAC;AAEF,eAAO,MAAM,mBAAmB,QAAa,OAAO,CAAC,SAAS,EAAE,CA8B/D,CAAC"}
+{"version":3,"file":"adb.d.ts","sourceRoot":"","sources":["../src/adb.ts"],"names":[],"mappings":"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"}

package/dist/adb.js

@@ -1,7 +1,7 @@
 import { spawn, SubprocessError } from '@react-native-harness/tools';
 import { spawn as nodeSpawn } from 'node:child_process';
 import { access, rm } from 'node:fs/promises';
-import { ensureAndroidSdkPackages, getAdbBinaryPath, getAndroidSystemImagePackage, getAvdManagerBinaryPath, getEmulatorBinaryPath, getHostAndroidSystemImageArch, getRequiredAndroidSdkPackages, getSdkManagerBinaryPath, } from './environment.js';
+import { ensureAndroidEmulatorAvailable, ensureAndroidSdkPackages, getAdbBinaryPath, getAndroidSystemImagePackage, getAvdManagerBinaryPath, getEmulatorBinaryPath, getHostAndroidSystemImageArch, getRequiredAndroidSdkPackages, } from './environment.js';
 import { getEmulatorStartupArgs, } from './emulator-startup.js';
 const wait = async (ms) => {
     await new Promise((resolve) => {
@@ -64,16 +64,10 @@ const formatEmulatorStartupError = ({ name, stdout, stderr, exitCode, signal, er
     });
 };
 const ensureEmulatorInstalled = async () => {
+    await ensureAndroidEmulatorAvailable();
     const emulatorBinaryPath = getEmulatorBinaryPath();
-    try {
-        await access(emulatorBinaryPath);
-        return emulatorBinaryPath;
-    }
-    catch {
-        await spawn(getSdkManagerBinaryPath(), ['emulator']);
-        await access(emulatorBinaryPath);
-        return emulatorBinaryPath;
-    }
+    await access(emulatorBinaryPath);
+    return emulatorBinaryPath;
 };
 export const getRequiredEmulatorPackages = (apiLevel) => {
     return getRequiredAndroidSdkPackages({

package/dist/environment.d.ts

@@ -15,6 +15,9 @@ export declare const getRequiredAndroidSdkPackages: ({ apiLevel, includeEmulator
     architecture?: AndroidSystemImageArch;
 }) => string[];
 export declare const ensureAndroidSdkPackages: (packages: readonly string[], { env, platform, homeDirectory, }?: AndroidSdkRootOptions) => Promise<string>;
+export declare const ensureAndroidAdbAvailable: (options?: AndroidSdkRootOptions) => Promise<string>;
+export declare const ensureAndroidEmulatorAvailable: (options?: AndroidSdkRootOptions) => Promise<string>;
+export declare const ensureAndroidAvdProvisioningAvailable: (apiLevel: number, architecture?: AndroidSystemImageArch, options?: AndroidSdkRootOptions) => Promise<string>;
 export declare const ensureAndroidDiscoveryEnvironment: () => Promise<string>;
 export declare const ensureAndroidPhysicalDeviceEnvironment: () => Promise<string>;
 export declare const ensureAndroidEmulatorEnvironment: (apiLevel: number) => Promise<string>;

package/dist/environment.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"environment.d.ts","sourceRoot":"","sources":["../src/environment.ts"],"names":[],"mappings":"AAcA,MAAM,MAAM,sBAAsB,GAAG,QAAQ,GAAG,WAAW,GAAG,aAAa,CAAC;AAE5E,KAAK,qBAAqB,GAAG;IAC3B,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC;IACxB,QAAQ,CAAC,EAAE,MAAM,CAAC,QAAQ,CAAC;IAC3B,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB,CAAC;AAQF,eAAO,MAAM,4BAA4B,GAAI,+BAG1C,IAAI,CAAC,qBAAqB,EAAE,KAAK,CAAM,KAAG,MAAM,GAAG,IAUrD,CAAC;AAwRF,eAAO,MAAM,iBAAiB,GAC5B,MAAK,MAAM,CAAC,UAAwB,EACpC,UAAS,IAAI,CAAC,qBAAqB,EAAE,KAAK,CAAM,KAC/C,MAAM,GAAG,IAIX,CAAC;AAiBF,eAAO,MAAM,6BAA6B,GACxC,eAAc,MAAqB,KAClC,sBAUF,CAAC;AAEF,eAAO,MAAM,yBAAyB,GAAI,UAAU,MAAM,KAAG,MAE5D,CAAC;AAEF,eAAO,MAAM,4BAA4B,GACvC,UAAU,MAAM,EAChB,eAAc,sBAAwD,KACrE,MAEF,CAAC;AAEF,eAAO,MAAM,6BAA6B,GAAI,+CAI3C;IACD,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,YAAY,CAAC,EAAE,sBAAsB,CAAC;CAClC,KAAG,MAAM,EAed,CAAC;AAEF,eAAO,MAAM,wBAAwB,GACnC,UAAU,SAAS,MAAM,EAAE,EAC3B,oCAIG,qBAA0B,KAC5B,OAAO,CAAC,MAAM,CA0BhB,CAAC;AAEF,eAAO,MAAM,iCAAiC,QAAa,OAAO,CAAC,MAAM,CAMxE,CAAC;AAEF,eAAO,MAAM,sCAAsC,QACvC,OAAO,CAAC,MAAM,CAIvB,CAAC;AAEJ,eAAO,MAAM,gCAAgC,GAC3C,UAAU,MAAM,KACf,OAAO,CAAC,MAAM,CAShB,CAAC;AAEF,eAAO,MAAM,oBAAoB,GAC/B,MAAK,MAAM,CAAC,UAAwB,KACnC,MAAM,CAAC,UA2BT,CAAC;AAEF,eAAO,MAAM,2BAA2B,QAAO,IAE9C,CAAC;AAEF,eAAO,MAAM,gBAAgB,GAC3B,UAAS,MAAoC,KAC5C,MAAqD,CAAC;AAEzD,eAAO,MAAM,qBAAqB,GAChC,UAAS,MAAoC,KAC5C,MAAoD,CAAC;AAExD,eAAO,MAAM,uBAAuB,GAClC,UAAS,MAAoC,KAC5C,MACsE,CAAC;AAE1E,eAAO,MAAM,uBAAuB,GAClC,UAAS,MAAoC,KAC5C,MACsE,CAAC"}
+{"version":3,"file":"environment.d.ts","sourceRoot":"","sources":["../src/environment.ts"],"names":[],"mappings":"AAcA,MAAM,MAAM,sBAAsB,GAAG,QAAQ,GAAG,WAAW,GAAG,aAAa,CAAC;AAE5E,KAAK,qBAAqB,GAAG;IAC3B,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC;IACxB,QAAQ,CAAC,EAAE,MAAM,CAAC,QAAQ,CAAC;IAC3B,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB,CAAC;AAQF,eAAO,MAAM,4BAA4B,GAAI,+BAG1C,IAAI,CAAC,qBAAqB,EAAE,KAAK,CAAM,KAAG,MAAM,GAAG,IAUrD,CAAC;AAwRF,eAAO,MAAM,iBAAiB,GAC5B,MAAK,MAAM,CAAC,UAAwB,EACpC,UAAS,IAAI,CAAC,qBAAqB,EAAE,KAAK,CAAM,KAC/C,MAAM,GAAG,IAIX,CAAC;AAiBF,eAAO,MAAM,6BAA6B,GACxC,eAAc,MAAqB,KAClC,sBAUF,CAAC;AAEF,eAAO,MAAM,yBAAyB,GAAI,UAAU,MAAM,KAAG,MAE5D,CAAC;AAEF,eAAO,MAAM,4BAA4B,GACvC,UAAU,MAAM,EAChB,eAAc,sBAAwD,KACrE,MAEF,CAAC;AAEF,eAAO,MAAM,6BAA6B,GAAI,+CAI3C;IACD,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,YAAY,CAAC,EAAE,sBAAsB,CAAC;CAClC,KAAG,MAAM,EAed,CAAC;AAoBF,eAAO,MAAM,wBAAwB,GACnC,UAAU,SAAS,MAAM,EAAE,EAC3B,oCAIG,qBAA0B,KAC5B,OAAO,CAAC,MAAM,CA8BhB,CAAC;AAEF,eAAO,MAAM,yBAAyB,GACpC,UAAS,qBAA0B,KAClC,OAAO,CAAC,MAAM,CAEhB,CAAC;AAEF,eAAO,MAAM,8BAA8B,GACzC,UAAS,qBAA0B,KAClC,OAAO,CAAC,MAAM,CAEhB,CAAC;AAEF,eAAO,MAAM,qCAAqC,GAChD,UAAU,MAAM,EAChB,eAAc,sBAAwD,EACtE,UAAS,qBAA0B,KAClC,OAAO,CAAC,MAAM,CAQhB,CAAC;AAEF,eAAO,MAAM,iCAAiC,QAAa,OAAO,CAAC,MAAM,CAIxE,CAAC;AAEF,eAAO,MAAM,sCAAsC,QACvC,OAAO,CAAC,MAAM,CAIvB,CAAC;AAEJ,eAAO,MAAM,gCAAgC,GAC3C,UAAU,MAAM,KACf,OAAO,CAAC,MAAM,CAOhB,CAAC;AAEF,eAAO,MAAM,oBAAoB,GAC/B,MAAK,MAAM,CAAC,UAAwB,KACnC,MAAM,CAAC,UA2BT,CAAC;AAEF,eAAO,MAAM,2BAA2B,QAAO,IAE9C,CAAC;AAEF,eAAO,MAAM,gBAAgB,GAC3B,UAAS,MAAoC,KAC5C,MAAqD,CAAC;AAEzD,eAAO,MAAM,qBAAqB,GAChC,UAAS,MAAoC,KAC5C,MAAoD,CAAC;AAExD,eAAO,MAAM,uBAAuB,GAClC,UAAS,MAAoC,KAC5C,MACsE,CAAC;AAE1E,eAAO,MAAM,uBAAuB,GAClC,UAAS,MAAoC,KAC5C,MACsE,CAAC"}

package/dist/environment.js

@@ -232,34 +232,56 @@ export const getRequiredAndroidSdkPackages = ({ apiLevel, includeEmulator = fals
     }
     return packages;
 };
-export const ensureAndroidSdkPackages = async (packages, { env = process.env, platform = process.platform, homeDirectory = os.homedir(), } = {}) => {
+const getMissingAndroidSdkPackagesForEnvironment = async (packages, { env = process.env, platform = process.platform, homeDirectory = os.homedir(), } = {}) => {
     const sdkRoot = getRequiredAndroidSdkRoot(env, { platform, homeDirectory });
     await mkdir(sdkRoot, { recursive: true });
-    await ensureAndroidCommandLineTools(sdkRoot, platform);
-    const missingPackages = await getMissingAndroidSdkPackages(sdkRoot, packages);
-    if (missingPackages.length > 0) {
-        await installAndroidSdkPackages(sdkRoot, missingPackages);
+    return {
+        sdkRoot,
+        missingPackages: await getMissingAndroidSdkPackages(sdkRoot, packages),
+    };
+};
+export const ensureAndroidSdkPackages = async (packages, { env = process.env, platform = process.platform, homeDirectory = os.homedir(), } = {}) => {
+    const { sdkRoot, missingPackages } = await getMissingAndroidSdkPackagesForEnvironment(packages, {
+        env,
+        platform,
+        homeDirectory,
+    });
+    if (missingPackages.length === 0) {
+        return sdkRoot;
     }
+    await ensureAndroidCommandLineTools(sdkRoot, platform);
+    await installAndroidSdkPackages(sdkRoot, missingPackages);
     const unresolvedPackages = await getMissingAndroidSdkPackages(sdkRoot, packages);
     if (unresolvedPackages.length > 0) {
         throw new Error(`Android SDK packages are still missing after installation: ${unresolvedPackages.join(', ')}`);
     }
     return sdkRoot;
 };
+export const ensureAndroidAdbAvailable = async (options = {}) => {
+    return ensureAndroidSdkPackages(['platform-tools'], options);
+};
+export const ensureAndroidEmulatorAvailable = async (options = {}) => {
+    return ensureAndroidSdkPackages(['emulator'], options);
+};
+export const ensureAndroidAvdProvisioningAvailable = async (apiLevel, architecture = getHostAndroidSystemImageArch(), options = {}) => {
+    return ensureAndroidSdkPackages([
+        getAndroidPlatformPackage(apiLevel),
+        getAndroidSystemImagePackage(apiLevel, architecture),
+    ], options);
+};
 export const ensureAndroidDiscoveryEnvironment = async () => {
     initializeAndroidProcessEnv();
-    return ensureAndroidSdkPackages(getRequiredAndroidSdkPackages({ includeEmulator: true }));
+    return ensureAndroidAdbAvailable();
 };
 export const ensureAndroidPhysicalDeviceEnvironment = async () => {
     initializeAndroidProcessEnv();
-    return ensureAndroidSdkPackages(getRequiredAndroidSdkPackages());
+    return ensureAndroidAdbAvailable();
 };
 export const ensureAndroidEmulatorEnvironment = async (apiLevel) => {
     initializeAndroidProcessEnv();
-    return ensureAndroidSdkPackages(getRequiredAndroidSdkPackages({
-        apiLevel,
-        includeEmulator: true,
-    }));
+    await ensureAndroidAdbAvailable();
+    await ensureAndroidEmulatorAvailable();
+    return ensureAndroidAvdProvisioningAvailable(apiLevel);
 };
 export const getAndroidProcessEnv = (env = process.env) => {
     const sdkRoot = getAndroidSdkRoot(env);

package/dist/instance.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"instance.d.ts","sourceRoot":"","sources":["../src/instance.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,KAAK,0BAA0B,EAC/B,qBAAqB,EACtB,MAAM,iCAAiC,CAAC;AACzC,OAAO,KAAK,EAAE,MAAM,IAAI,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAE5E,OAAO,EACL,qBAAqB,EAGtB,MAAM,aAAa,CAAC;AAgKrB,eAAO,MAAM,kCAAkC,GAC7C,QAAQ,qBAAqB,EAC7B,eAAe,aAAa,EAC5B,MAAM,0BAA0B,KAC/B,OAAO,CAAC,qBAAqB,CAoI/B,CAAC;AAEF,eAAO,MAAM,wCAAwC,GACnD,QAAQ,qBAAqB,EAC7B,eAAe,aAAa,KAC3B,OAAO,CAAC,qBAAqB,CAiE/B,CAAC"}
+{"version":3,"file":"instance.d.ts","sourceRoot":"","sources":["../src/instance.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,KAAK,0BAA0B,EAC/B,qBAAqB,EACtB,MAAM,iCAAiC,CAAC;AACzC,OAAO,KAAK,EAAE,MAAM,IAAI,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAE5E,OAAO,EACL,qBAAqB,EAGtB,MAAM,aAAa,CAAC;AAkKrB,eAAO,MAAM,kCAAkC,GAC7C,QAAQ,qBAAqB,EAC7B,eAAe,aAAa,EAC5B,MAAM,0BAA0B,KAC/B,OAAO,CAAC,qBAAqB,CAkI/B,CAAC;AAEF,eAAO,MAAM,wCAAwC,GACnD,QAAQ,qBAAqB,EAC7B,eAAe,aAAa,KAC3B,OAAO,CAAC,qBAAqB,CAiE/B,CAAC"}

package/dist/instance.js

@@ -8,7 +8,7 @@ import { applyHarnessDebugHttpHost, clearHarnessDebugHttpHost, } from './shared-
 import { getDeviceName } from './utils.js';
 import { createAndroidAppMonitor } from './app-monitor.js';
 import { HarnessAppPathError, HarnessEmulatorConfigError } from './errors.js';
-import { ensureAndroidEmulatorEnvironment, getHostAndroidSystemImageArch, } from './environment.js';
+import { ensureAndroidEmulatorAvailable, ensureAndroidEmulatorEnvironment, getHostAndroidSystemImageArch, } from './environment.js';
 import { isInteractive } from '@react-native-harness/tools';
 import fs from 'node:fs';
 const androidInstanceLogger = logger.child('android-instance');
@@ -40,6 +40,7 @@ const configureAndroidRuntime = async (adbId, config, harnessConfig) => {
     return adb.getAppUid(adbId, config.bundleId);
 };
 const startAndWaitForBoot = async ({ emulatorName, signal, mode, }) => {
+    await ensureAndroidEmulatorAvailable();
     await adb.startEmulator(emulatorName, mode);
     return adb.waitForBoot(emulatorName, signal);
 };
@@ -135,9 +136,6 @@ export const getAndroidEmulatorPlatformInstance = async (config, harnessConfig,
         startedByHarness = true;
         androidInstanceLogger.debug('Android emulator %s connected as %s', emulatorConfig.name, adbId);
     }
-    else if (emulatorConfig.avd) {
-        await ensureAndroidEmulatorEnvironment(emulatorConfig.avd.apiLevel);
-    }
     if (!adbId) {
         throw new DeviceNotFoundError(getDeviceName(emulatorConfig));
     }

package/dist/runner.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"runner.d.ts","sourceRoot":"","sources":["../src/runner.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,qBAAqB,EACrB,KAAK,0BAA0B,EAChC,MAAM,iCAAiC,CAAC;AACzC,OAAO,KAAK,EAAE,MAAM,IAAI,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAC5E,OAAO,EAEL,KAAK,qBAAqB,EAE3B,MAAM,aAAa,CAAC;AAWrB,QAAA,MAAM,gBAAgB,GACpB,QAAQ,qBAAqB,EAC7B,eAAe,aAAa,EAC5B,MAAM,0BAA0B,KAC/B,OAAO,CAAC,qBAAqB,CAoB/B,CAAC;AAEF,eAAe,gBAAgB,CAAC"}
+{"version":3,"file":"runner.d.ts","sourceRoot":"","sources":["../src/runner.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,qBAAqB,EACrB,KAAK,0BAA0B,EAChC,MAAM,iCAAiC,CAAC;AACzC,OAAO,KAAK,EAAE,MAAM,IAAI,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAC5E,OAAO,EAEL,KAAK,qBAAqB,EAE3B,MAAM,aAAa,CAAC;AAUrB,QAAA,MAAM,gBAAgB,GACpB,QAAQ,qBAAqB,EAC7B,eAAe,aAAa,EAC5B,MAAM,0BAA0B,KAC/B,OAAO,CAAC,qBAAqB,CAgB/B,CAAC;AAEF,eAAe,gBAAgB,CAAC"}

package/dist/runner.js

@@ -1,16 +1,13 @@
 import { AndroidPlatformConfigSchema, isAndroidDeviceEmulator, } from './config.js';
 import { getAndroidEmulatorPlatformInstance, getAndroidPhysicalDevicePlatformInstance, } from './instance.js';
-import { ensureAndroidEmulatorEnvironment, ensureAndroidPhysicalDeviceEnvironment, initializeAndroidProcessEnv, } from './environment.js';
+import { ensureAndroidAdbAvailable, initializeAndroidProcessEnv, } from './environment.js';
 const getAndroidRunner = async (config, harnessConfig, init) => {
     const parsedConfig = AndroidPlatformConfigSchema.parse(config);
     initializeAndroidProcessEnv();
+    await ensureAndroidAdbAvailable();
     if (isAndroidDeviceEmulator(parsedConfig.device)) {
-        if (parsedConfig.device.avd) {
-            await ensureAndroidEmulatorEnvironment(parsedConfig.device.avd.apiLevel);
-        }
         return getAndroidEmulatorPlatformInstance(parsedConfig, harnessConfig, init);
     }
-    await ensureAndroidPhysicalDeviceEnvironment();
     return getAndroidPhysicalDevicePlatformInstance(parsedConfig, harnessConfig);
 };
 export default getAndroidRunner;

package/dist/targets.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"targets.d.ts","sourceRoot":"","sources":["../src/targets.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAI5D,eAAO,MAAM,aAAa,QAAa,OAAO,CAAC,SAAS,EAAE,CAoCzD,CAAC"}
+{"version":3,"file":"targets.d.ts","sourceRoot":"","sources":["../src/targets.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAQ5D,eAAO,MAAM,aAAa,QAAa,OAAO,CAAC,SAAS,EAAE,CAuCzD,CAAC"}

package/dist/targets.js

@@ -1,7 +1,9 @@
 import * as adb from './adb.js';
-import { ensureAndroidDiscoveryEnvironment } from './environment.js';
+import { ensureAndroidAdbAvailable, ensureAndroidEmulatorAvailable, initializeAndroidProcessEnv, } from './environment.js';
 export const getRunTargets = async () => {
-    await ensureAndroidDiscoveryEnvironment();
+    initializeAndroidProcessEnv();
+    await ensureAndroidAdbAvailable();
+    await ensureAndroidEmulatorAvailable();
     const [avds, connectedDevices] = await Promise.all([
         adb.getAvds(),
         adb.getConnectedDevices(),