Merge pull request #3443 from NativeScript/kerezov/android-double-build

Mitko-Kerezov · web-flow · commit f14b61729a94 · 2018-03-12T17:24:21.000+02:00
fix: stop build twice for android
diff --git a/lib/services/livesync/livesync-service.ts b/lib/services/livesync/livesync-service.ts
@@ -439,7 +439,7 @@ export class LiveSyncService extends EventEmitter implements IDebugLiveSyncServi
 	}
 
 	private async installedCachedAppPackage(platform: string, options: IEnsureLatestAppPackageIsInstalledOnDeviceOptions): Promise<any> {
-		const rebuildInfo = _.find(options.rebuiltInformation, info => info.isEmulator === options.device.isEmulator && info.platform === platform);
+		const rebuildInfo = _.find(options.rebuiltInformation, info => info.platform === platform && (this.$mobileHelper.isAndroidPlatform(platform) || info.isEmulator === options.device.isEmulator));
 
 		if (rebuildInfo) {
 			// Case where we have three devices attached, a change that requires build is found,

Original file line number	Diff line number	Diff line change
`@@ -439,7 +439,7 @@ export class LiveSyncService extends EventEmitter implements IDebugLiveSyncServi`
`439`	`439`	`}`
`440`	`440`
`441`	`441`	`private async installedCachedAppPackage(platform: string, options: IEnsureLatestAppPackageIsInstalledOnDeviceOptions): Promise<any> {`
`442`		`- const rebuildInfo = _.find(options.rebuiltInformation, info => info.isEmulator === options.device.isEmulator && info.platform === platform);`
	`442`	`+ const rebuildInfo = _.find(options.rebuiltInformation, info => info.platform === platform && (this.$mobileHelper.isAndroidPlatform(platform) \|\| info.isEmulator === options.device.isEmulator));`
`443`	`443`
`444`	`444`	`if (rebuildInfo) {`
`445`	`445`	`// Case where we have three devices attached, a change that requires build is found,`