Skip to content

Commit b5e6e6b

Browse files
committed
passed arguments as list to avoid linux crash
1 parent 89fecb4 commit b5e6e6b

File tree

1 file changed

+19
-2
lines changed

1 file changed

+19
-2
lines changed

build.gradle

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ def minSdkVer = "";
2929
def targetSdkVer = "";
3030
def supportVer = "";
3131

32+
def envVars = new LinkedList<String>()
33+
3234
task checkEnvironmentVariables {
3335
if ("$System.env.JAVA_HOME" == "" || "$System.env.JAVA_HOME" == "null") {
3436
throw new GradleException("Set JAVA_HOME to point to the correct Jdk location\n");
@@ -48,18 +50,23 @@ task checkEnvironmentVariables {
4850

4951
if(project.hasProperty("compileSdk")) {
5052
compileSdkVer = "-PcompileSdk=$compileSdk"
53+
envVars.add(compileSdkVer)
5154
}
5255
if(project.hasProperty("buildToolsVersion")) {
5356
buildToolsVer = "-PbuildToolsVersion=$buildToolsVersion"
57+
envVars.add(buildToolsVer)
5458
}
5559
if(project.hasProperty("minSdk")) {
5660
minSdkVer = "-PminSdk=$minSdk"
61+
envVars.add(minSdkVer)
5762
}
5863
if(project.hasProperty("targetSdk")) {
5964
targetSdkVer = "-PtargetSdk=$targetSdk"
65+
envVars.add(targetSdkVer)
6066
}
6167
if(project.hasProperty("supportVersion")) {
6268
supportVer = "-PsupportVersion=$supportVersion"
69+
envVars.add(supportVer)
6370
}
6471
}
6572

@@ -175,10 +182,20 @@ task generateRuntime (type: Exec) {
175182

176183
//command gradlew buildar -PpackageVersion=[from_package.json] -PgitCommitVersion=[from_some_sys_variable]
177184
if(isWinOs) {
178-
commandLine "cmd", "/c" , "gradlew", "buildar", "-PpackageVersion=${pVersion}", "-PgitCommitVersion=${arVersion}", compileSdkVer, buildToolsVer, minSdkVer, targetSdkVer, supportVer
185+
envVars.addFirst("-PgitCommitVersion=${arVersion}");
186+
envVars.addFirst("-PpackageVersion=${pVersion}");
187+
envVars.addFirst("buildar");
188+
envVars.addFirst("gradlew");
189+
envVars.addFirst("/c");
190+
envVars.addFirst("cmd");
191+
commandLine envVars.toArray()
179192
}
180193
else {
181-
commandLine "./gradlew", "buildar", "-PpackageVersion=${pVersion}", "-PgitCommitVersion=${arVersion}", compileSdkVer, buildToolsVer, minSdkVer, targetSdkVer, supportVer
194+
envVars.addFirst("-PgitCommitVersion=${arVersion}");
195+
envVars.addFirst("-PpackageVersion=${pVersion}");
196+
envVars.addFirst("buildar");
197+
envVars.addFirst("./gradlew");
198+
commandLine envVars.toArray();
182199
}
183200
}
184201
}

0 commit comments

Comments
 (0)