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

Fatme · Fatme · commit 586afc777c66 · 2015-10-09T14:55:23.000+03:00
Fixes NativeScript#1031
diff --git a/lib/common b/lib/common
@@ -1 +1 @@
-Subproject commit 95ae6b381baf7d860c5127b6ec0b81ca4752bdce
+Subproject commit cb382891c6b147c0a3dca653d085a18c14442623
diff --git a/lib/definitions/project.d.ts b/lib/definitions/project.d.ts
@@ -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 {
diff --git a/lib/services/android-project-service.ts b/lib/services/android-project-service.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>()();
diff --git a/lib/services/ios-project-service.ts b/lib/services/ios-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();
 	}
 
diff --git a/lib/services/platform-service.ts b/lib/services/platform-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();
 
diff --git a/test/stubs.ts b/test/stubs.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();
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ interface IPlatformProjectService {`
`53`	`53`	`removePluginNativeCode(pluginData: IPluginData): IFuture<void>;`
`54`	`54`	`afterPrepareAllPlugins(): IFuture<void>;`
`55`	`55`	`getAppResourcesDestinationDirectoryPath(): IFuture<string>;`
`56`		`- deploy(device: Mobile.IDevice, appIdentifier: string): IFuture<void>;`
	`56`	`+ deploy(deviceIdentifier: string): IFuture<void>;`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`interface IAndroidProjectPropertiesManager {`
Original file line number	Diff line number	Diff line change
`@@ -212,7 +212,7 @@ export class IOSProjectService extends projectServiceBaseLib.PlatformProjectServ`
`212`	`212`	`}).future<void>()();`
`213`	`213`	`}`
`214`	`214`
`215`		`- public deploy(device: Mobile.IDevice, appIdentifier: string): IFuture<void> {`
	`215`	`+ public deploy(deviceIdentifier: string): IFuture<void> {`
`216`	`216`	`return Future.fromResult();`
`217`	`217`	`}`
`218`	`218`
Original file line number	Diff line number	Diff line change
`@@ -325,7 +325,7 @@ export class PlatformProjectServiceStub implements IPlatformProjectService {`
`325`	`325`	`afterPrepareAllPlugins(): IFuture<void> {`
`326`	`326`	`return Future.fromResult();`
`327`	`327`	`}`
`328`		`- deploy(device: Mobile.IAndroidDevice, appIdentifier: string): IFuture<void> {`
	`328`	`+ deploy(deviceIdentifier: string): IFuture<void> {`
`329`	`329`	`return Future.fromResult();`
`330`	`330`	`}`
`331`	`331`	`}`