feat: only install corresponding abi package when possible

Author: farfromrefug

lib/common/definitions/mobile.d.ts

@@ -99,6 +99,12 @@ declare global {
 			 * For iOS simulators - same as the identifier.
 			 */
 			imageIdentifier?: string;
+
+			/**
+			 *  Optional property describing the architecture of the device
+			 *  Available for Android only
+			 */
+			 abis?: string[];
 		}
 
 		interface IDeviceError extends Error, IDeviceIdentifier {}

lib/common/mobile/android/android-device.ts

@@ -13,6 +13,9 @@ interface IAndroidDeviceDetails {
 	name: string;
 	release: string;
 	brand: string;
+	'cpu.abi': string;
+	'cpu.abilist64': string;
+	'cpu.abilist32': string;
 }
 
 interface IAdbDeviceStatusInfo {
@@ -96,6 +99,7 @@ export class AndroidDevice implements Mobile.IAndroidDevice {
 			identifier: this.identifier,
 			displayName: details.name,
 			model: details.model,
+			abis: details['cpu.abilist64'].split(',').concat(details['cpu.abilist32'].split(',')),
 			version,
 			vendor: details.brand,
 			platform: this.$devicePlatformsConstants.Android,

lib/controllers/build-controller.ts

@@ -116,7 +116,7 @@ export class BuildController extends EventEmitter implements IBuildController {
 		);
 
 		if (buildData.copyTo) {
-			this.$buildArtefactsService.copyLatestAppPackage(
+			this.$buildArtefactsService.copyAppPackages(
 				buildData.copyTo,
 				platformData,
 				buildData

lib/controllers/deploy-controller.ts

@@ -23,11 +23,10 @@ export class DeployController {
 				},
 			};
 			await this.$prepareController.prepare(prepareData);
-			const packageFilePath = await deviceDescriptor.buildAction();
+			await deviceDescriptor.buildAction();
 			await this.$deviceInstallAppService.installOnDevice(
 				device,
-				{ ...deviceDescriptor.buildData, buildForDevice: !device.isEmulator },
-				packageFilePath
+				{ ...deviceDescriptor.buildData, buildForDevice: !device.isEmulator }
 			);
 		};
 

lib/controllers/run-controller.ts

@@ -473,7 +473,6 @@ export class RunController extends EventEmitter implements IRunController {
 		deviceDescriptors: ILiveSyncDeviceDescriptor[]
 	): Promise<void> {
 		const rebuiltInformation: IDictionary<{
-			packageFilePath: string;
 			platform: string;
 			isEmulator: boolean;
 		}> = {};
@@ -509,8 +508,6 @@ export class RunController extends EventEmitter implements IRunController {
 			);
 
 			try {
-				let packageFilePath: string = null;
-
 				// Case where we have three devices attached, a change that requires build is found,
 				// we'll rebuild the app only for the first device, but we should install new package on all three devices.
 				if (
@@ -521,24 +518,19 @@ export class RunController extends EventEmitter implements IRunController {
 						rebuiltInformation[platformData.platformNameLowerCase]
 							.isEmulator === device.isEmulator)
 				) {
-					packageFilePath =
-						rebuiltInformation[platformData.platformNameLowerCase]
-							.packageFilePath;
 					await this.$deviceInstallAppService.installOnDevice(
 						device,
-						buildData,
-						packageFilePath
+						buildData
 					);
 				} else {
 					const shouldBuild =
 						prepareResultData.hasNativeChanges ||
 						(await this.$buildController.shouldBuild(buildData));
 					if (shouldBuild) {
-						packageFilePath = await deviceDescriptor.buildAction();
+						await deviceDescriptor.buildAction();
 						rebuiltInformation[platformData.platformNameLowerCase] = {
 							isEmulator: device.isEmulator,
-							platform: platformData.platformNameLowerCase,
-							packageFilePath,
+							platform: platformData.platformNameLowerCase
 						};
 					} else {
 						await this.$analyticsService.trackEventActionInGoogleAnalytics({
@@ -550,8 +542,7 @@ export class RunController extends EventEmitter implements IRunController {
 
 					await this.$deviceInstallAppService.installOnDeviceIfNeeded(
 						device,
-						buildData,
-						packageFilePath
+						buildData
 					);
 				}
 
@@ -710,9 +701,7 @@ export class RunController extends EventEmitter implements IRunController {
 
 					await this.$deviceInstallAppService.installOnDevice(
 						device,
-						deviceDescriptor.buildData,
-						rebuiltInformation[platformData.platformNameLowerCase]
-							.packageFilePath
+						deviceDescriptor.buildData
 					);
 					await platformLiveSyncService.syncAfterInstall(device, watchInfo);
 					await this.refreshApplication(

lib/definitions/build.d.ts

@@ -61,7 +61,7 @@ interface IBuildArtefactsService {
 		platformData: IPlatformData,
 		buildOutputOptions: IBuildOutputOptions
 	): Promise<string>;
-	copyLatestAppPackage(
+	copyAppPackages(
 		targetPath: string,
 		platformData: IPlatformData,
 		buildOutputOptions: IBuildOutputOptions

lib/definitions/run.d.ts

@@ -28,13 +28,11 @@ declare global {
 	interface IDeviceInstallAppService {
 		installOnDevice(
 			device: Mobile.IDevice,
-			buildData: IBuildData,
-			packageFile?: string
+			buildData: IBuildData
 		): Promise<void>;
 		installOnDeviceIfNeeded(
 			device: Mobile.IDevice,
-			buildData: IBuildData,
-			packageFile?: string
+			buildData: IBuildData
 		): Promise<void>;
 		shouldInstall(
 			device: Mobile.IDevice,

lib/services/build-artefacts-service.ts

@@ -75,7 +75,7 @@ export class BuildArtefactsService implements IBuildArtefactsService {
 		return [];
 	}
 
-	public copyLatestAppPackage(
+	public copyAppPackages(
 		targetPath: string,
 		platformData: IPlatformData,
 		buildOutputOptions: IBuildOutputOptions
@@ -85,31 +85,39 @@ export class BuildArtefactsService implements IBuildArtefactsService {
 		const outputPath =
 			buildOutputOptions.outputPath ||
 			platformData.getBuildOutputPath(buildOutputOptions);
-		const applicationPackage = this.getLatestApplicationPackage(
+		const applicationPackages = this.getAllAppPackages(
 			outputPath,
 			platformData.getValidBuildOutputData(buildOutputOptions)
 		);
-		const packageFile = applicationPackage.packageName;
 
 		this.$fs.ensureDirectoryExists(path.dirname(targetPath));
 
+		let filterFilename: string;
 		if (
+			applicationPackages.length > 1 &&
 			this.$fs.exists(targetPath) &&
-			this.$fs.getFsStats(targetPath).isDirectory()
+			!this.$fs.getFsStats(targetPath).isDirectory()
 		) {
-			const sourceFileName = path.basename(packageFile);
+			filterFilename = path.basename(targetPath);
+			targetPath = path.dirname(targetPath);
 			this.$logger.trace(
-				`Specified target path: '${targetPath}' is directory. Same filename will be used: '${sourceFileName}'.`
+				`Multiple packages were built but only ${filterFilename} will be copied if existing'.`
 			);
-			targetPath = path.join(targetPath, sourceFileName);
 		}
-		this.$fs.copyFile(packageFile, targetPath);
-		this.$logger.info(`Copied file '${packageFile}' to '${targetPath}'.`);
+		applicationPackages.forEach(pack => {
+			const fileName = path.basename(pack.packageName);
+			if (!filterFilename || fileName === filterFilename) {
+				const targetFilePath = path.join(targetPath, path.basename(pack.packageName));
+				this.$fs.copyFile(pack.packageName, path.join(targetPath, path.basename(pack.packageName)));
+				this.$logger.info(`Copied file '${pack.packageName}' to '${targetFilePath}'.`);
+			}
+		});
 	}
 
 	private getLatestApplicationPackage(
 		buildOutputPath: string,
-		validBuildOutputData: IValidBuildOutputData
+		validBuildOutputData: IValidBuildOutputData,
+		abis?: string[]
 	): IApplicationPackage {
 		let packages = this.getAllAppPackages(
 			buildOutputPath,

lib/services/device/device-install-app-service.ts

@@ -28,8 +28,7 @@ export class DeviceInstallAppService {
 
 	public async installOnDevice(
 		device: Mobile.IDevice,
-		buildData: IBuildData,
-		packageFile?: string
+		buildData: IBuildData
 	): Promise<void> {
 		this.$logger.info(
 			`Installing on device ${device.deviceInfo.identifier}...`
@@ -49,12 +48,38 @@ export class DeviceInstallAppService {
 			device,
 			projectDir: projectData.projectDir,
 		});
+		const buildOutputOptions = platformData.getValidBuildOutputData(buildData);
+		const outputPath = buildData.outputPath || platformData.getBuildOutputPath(buildData);
+		const packages = await this.$buildArtefactsService.getAllAppPackages(
+			outputPath,
+			buildOutputOptions
+		);
+		let packageFile;
+		if (packages.length === 1) {
+			// will always be the case on iOS
+			packageFile = packages[0].packageName;
+		} else if (device.deviceInfo.abis) {
+			device.deviceInfo.abis.every(abi=>{
+				const index = packages.findIndex(p => p.packageName.indexOf(abi) !== -1);
+				if (index !== -1) {
+					packageFile = packages[index].packageName;
+					return false;
+				}
+				return true;
+			})
+		} else {
+			//we did not find corresponding abi let's try universal
+			const index = packages.findIndex(p => p.packageName.indexOf('universal') !== -1);
+			if (index !== -1) {
+				packageFile = packages[index].packageName;
+			}
+		}
 
 		if (!packageFile) {
-			packageFile = await this.$buildArtefactsService.getLatestAppPackagePath(
-				platformData,
-				buildData
+			this.$logger.error(
+				`Could not find a package corresponding to the device with identifier '${device.deviceInfo.identifier}'.`
 			);
+			return;
 		}
 
 		await platformData.platformProjectService.cleanDeviceTempFolder(
@@ -88,18 +113,17 @@ export class DeviceInstallAppService {
 		}
 
 		this.$logger.info(
-			`Successfully installed on device with identifier '${device.deviceInfo.identifier}'.`
+			`Successfully installed on device with identifier '${device.deviceInfo.identifier} using package ${packageFile}'.`
 		);
 	}
 
 	public async installOnDeviceIfNeeded(
 		device: Mobile.IDevice,
-		buildData: IBuildData,
-		packageFile?: string
+		buildData: IBuildData
 	): Promise<void> {
 		const shouldInstall = await this.shouldInstall(device, buildData);
 		if (shouldInstall) {
-			await this.installOnDevice(device, buildData, packageFile);
+			await this.installOnDevice(device, buildData);
 		}
 	}