Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions lib/services/android-project-service.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -222,6 +222,9 @@ export class AndroidProjectService extends projectServiceBaseLib.PlatformProject
}

let gradleBin = this.useGradleWrapper(projectRoot) ? path.join(projectRoot, "gradlew") : "gradle";
if (this.$hostInfo.isWindows) {
gradleBin += ".bat"; // cmd command line parsing rules are weird. Avoid issues with quotes. See https://github.com/apache/cordova-android/blob/master/bin/templates/cordova/lib/builders/GradleBuilder.js for another approach
}
this.spawn(gradleBin, buildOptions, { stdio: "inherit", cwd: this.platformData.projectRoot }).wait();
} else {
this.checkAnt().wait();
Expand DownExpand Up@@ -368,11 +371,6 @@ export class AndroidProjectService extends projectServiceBaseLib.PlatformProject
}

private spawn(command: string, args: string[], opts?: any): IFuture<void> {
if (this.$hostInfo.isWindows) {
args.unshift('/s', '/c', command);
command = process.env.COMSPEC || 'cmd.exe';
}

return this.$childProcess.spawnFromEvent(command, args, "close", opts || { stdio: "inherit"});
}

Expand Down