Merge pull request #1039 from NativeScript/fatme/cherrypick-emulate-livesync-emulate

Fixes #1031

Author: Fatme

lib/common

@@ -53,7 +53,7 @@ interface IPlatformProjectService {
 	removePluginNativeCode(pluginData: IPluginData): IFuture<void>;
 	afterPrepareAllPlugins(): IFuture<void>;
 	getAppResourcesDestinationDirectoryPath(): IFuture<string>;
-	deploy(device: Mobile.IDevice, appIdentifier: string): IFuture<void>;
+	deploy(deviceIdentifier: string): IFuture<void>;
 }
 
 interface IAndroidProjectPropertiesManager {

lib/definitions/project.d.ts

@@ -6,6 +6,7 @@ import Future = require("fibers/future");
 import * as constants from "../constants";
 import * as semver from "semver";
 import * as projectServiceBaseLib from "./platform-project-service-base";
+import * as androidDebugBridgePath from "../common/mobile/android/android-debug-bridge";
 
 class AndroidProjectService extends projectServiceBaseLib.PlatformProjectServiceBase implements IPlatformProjectService {
 	private static VALUES_DIRNAME = "values";
@@ -28,7 +29,8 @@ class AndroidProjectService extends projectServiceBaseLib.PlatformProjectService
 		$projectData: IProjectData,
 		$projectDataService: IProjectDataService,
 		private $sysInfo: ISysInfo,
-		private $mobileHelper: Mobile.IMobileHelper) {
+		private $mobileHelper: Mobile.IMobileHelper,
+		private $injector: IInjector) {
 			super($fs, $projectData, $projectDataService);
 			this._androidProjectPropertiesManagers = Object.create(null);
 	}
@@ -285,10 +287,11 @@ class AndroidProjectService extends projectServiceBaseLib.PlatformProjectService
 		return Future.fromResult();
 	}
 
-	public deploy(device: Mobile.IAndroidDevice, appIdentifier: string): IFuture<void> {
+	public deploy(deviceIdentifier: string): IFuture<void> {
 		return (() => {
-			let deviceRootPath = `/data/local/tmp/${appIdentifier}`;
-			device.adb.executeShellCommand(["rm", "-rf", this.$mobileHelper.buildDevicePath(deviceRootPath, "fullsync"),
+			let adb = this.$injector.resolve(androidDebugBridgePath.AndroidDebugBridge, { identifier: deviceIdentifier });
+			let deviceRootPath = `/data/local/tmp/${this.$projectData.projectId}`;
+			adb.executeShellCommand(["rm", "-rf", this.$mobileHelper.buildDevicePath(deviceRootPath, "fullsync"),
 				this.$mobileHelper.buildDevicePath(deviceRootPath, "sync"),
 				this.$mobileHelper.buildDevicePath(deviceRootPath, "removedsync")]).wait();
 		}).future<void>()();

lib/services/android-project-service.ts

@@ -212,7 +212,7 @@ export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServ
 		}).future<void>()();
 	}
 
-	public deploy(device: Mobile.IDevice, appIdentifier: string): IFuture<void> {
+	public deploy(deviceIdentifier: string): IFuture<void> {
 		return Future.fromResult();
 	}
 

lib/services/ios-project-service.ts

@@ -276,7 +276,7 @@ export class PlatformService implements IPlatformService {
 			this.$devicesServices.initialize({platform: platform, deviceId: this.$options.device}).wait();
 			let action = (device: Mobile.IDevice): IFuture<void> => {
 				return (() => {
-					platformData.platformProjectService.deploy(device, this.$projectData.projectId).wait();
+					platformData.platformProjectService.deploy(device.deviceInfo.identifier).wait();
 					device.deploy(packageFile, this.$projectData.projectId).wait();
 
 					if (!this.$options.justlaunch) {
@@ -301,6 +301,9 @@ export class PlatformService implements IPlatformService {
 			emulatorServices.checkAvailability().wait();
 			emulatorServices.checkDependencies().wait();
 
+			let emulatorId = emulatorServices.getEmulatorId().wait();
+			platformData.platformProjectService.deploy(emulatorId).wait();
+
 			if(!this.$options.availableDevices) {
 				this.buildPlatform(platform, buildConfig).wait();
 

lib/services/platform-service.ts

@@ -325,7 +325,7 @@ export class PlatformProjectServiceStub implements IPlatformProjectService {
 	afterPrepareAllPlugins(): IFuture<void> {
 		return Future.fromResult();
 	}
-	deploy(device: Mobile.IAndroidDevice, appIdentifier: string): IFuture<void> {
+	deploy(deviceIdentifier: string): IFuture<void> {
 		return Future.fromResult();
 	}
 }