Merge pull request #1985 from NativeScript/raikov/fix-livesync-debug-android

Fixed: Livesync+Debug on Android not working when there are changes in tns-core-modules

Author: tzraikov

lib/services/android-project-service.ts

@@ -41,6 +41,7 @@ export class AndroidProjectService extends projectServiceBaseLib.PlatformProject
 		private $devicePlatformsConstants: Mobile.IDevicePlatformsConstants,
 		private $projectTemplatesService: IProjectTemplatesService,
 		private $xmlValidator: IXmlValidator,
+		private $config: IConfiguration,
 		private $npm: INodePackageManager) {
 		super($fs, $projectData, $projectDataService);
 		this._androidProjectPropertiesManagers = Object.create(null);
@@ -405,16 +406,18 @@ export class AndroidProjectService extends projectServiceBaseLib.PlatformProject
 	}
 
 	public beforePrepareAllPlugins(): IFuture<void> {
-		let buildOptions = this.getBuildOptions();
-		buildOptions.unshift("clean");
+		if (!this.$config.debugLivesync) {
+			let buildOptions = this.getBuildOptions();
 
-		let projectRoot = this.platformData.projectRoot;
-		let gradleBin = this.useGradleWrapper(projectRoot) ? path.join(projectRoot, "gradlew") : "gradle";
-		if (this.$hostInfo.isWindows) {
-			gradleBin += ".bat";
-		}
-		this.spawn(gradleBin, buildOptions, { stdio: "inherit", cwd: this.platformData.projectRoot }).wait();
+			buildOptions.unshift("clean");
 
+			let projectRoot = this.platformData.projectRoot;
+			let gradleBin = this.useGradleWrapper(projectRoot) ? path.join(projectRoot, "gradlew") : "gradle";
+			if (this.$hostInfo.isWindows) {
+				gradleBin += ".bat";
+			}
+			this.spawn(gradleBin, buildOptions, { stdio: "inherit", cwd: this.platformData.projectRoot }).wait();
+		}
 		return Future.fromResult();
 	}
 

test/npm-support.ts

@@ -78,6 +78,7 @@ function createTestInjector(): IInjector {
 	testInjector.register("mobilePlatformsCapabilities", MobilePlatformsCapabilities);
 	testInjector.register("devicePlatformsConstants", DevicePlatformsConstants);
 	testInjector.register("xmlValidator", XmlValidator);
+	testInjector.register("config", StaticConfigLib.Configuration);
 
 	return testInjector;
 }

test/plugins-service.ts

@@ -33,6 +33,7 @@ import {DeviceAppDataProvider} from "../lib/providers/device-app-data-provider";
 import {MobilePlatformsCapabilities} from "../lib/mobile-platforms-capabilities";
 import {DevicePlatformsConstants} from "../lib/common/mobile/device-platforms-constants";
 import { XmlValidator } from "../lib/xml-validator";
+import StaticConfigLib = require("../lib/config");
 import * as path from "path";
 import * as temp from "temp";
 temp.track();
@@ -99,6 +100,7 @@ function createTestInjector() {
 		defaultTemplate: future.fromResult("")
 	});
 	testInjector.register("xmlValidator", XmlValidator);
+	testInjector.register("config", StaticConfigLib.Configuration);
 
 	return testInjector;
 }