invoke gradle fullClean on android projects after removing a native plugin

Author: petekanev

lib/services/android-project-service.ts

@@ -367,8 +367,11 @@ export class AndroidProjectService extends projectServiceBaseLib.PlatformProject
 
 	public removePluginNativeCode(pluginData: IPluginData): void {
 		try {
-			this.$fs.deleteDirectory(path.join(this.platformData.projectRoot, "configurations", pluginData.name));
-			this.$fs.deleteDirectory(path.join(this.platformData.projectRoot, "src", pluginData.name));
+			// check whether the dependency that's being removed has native code
+			let pluginConfigDir = path.join(this.platformData.projectRoot, "configurations", pluginData.name);
+			if (this.$fs.exists(pluginConfigDir)) {
+				this.cleanProject(this.platformData.projectRoot, []);
+			}
 		} catch (e) {
 			if (e.code === "ENOENT") {
 				this.$logger.debug("No native code jars found: " + e.message);
@@ -396,18 +399,24 @@ export class AndroidProjectService extends projectServiceBaseLib.PlatformProject
 
 			let buildOptions = this.getBuildOptions();
 
-			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();
+
+			this.cleanProject(projectRoot, buildOptions);
 		}
 		return Future.fromResult();
 	}
 
+	private cleanProject(projectRoot: string, options: string[]): void {
+		options.unshift("clean");
+
+		let gradleBin = this.useGradleWrapper(projectRoot) ? path.join(projectRoot, "gradlew") : "gradle";
+		if (this.$hostInfo.isWindows) {
+			gradleBin += ".bat";
+		}
+
+		this.spawn(gradleBin, options, { stdio: "inherit", cwd: this.platformData.projectRoot }).wait();
+	}
+
 	public deploy(deviceIdentifier: string): IFuture<void> {
 		return (() => {
 			let adb = this.$injector.resolve(DeviceAndroidDebugBridge, { identifier: deviceIdentifier });