Fix compile error on *nix systems
This commit is contained in:
parent
30f8b6390d
commit
a9dee2a529
|
|
@ -8,17 +8,34 @@ dependencies {
|
||||||
sourceCompatibility = "7"
|
sourceCompatibility = "7"
|
||||||
targetCompatibility = "7"
|
targetCompatibility = "7"
|
||||||
|
|
||||||
|
task findDx {
|
||||||
|
if (OperatingSystem.current().isWindows()){
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
doLast {
|
||||||
|
new ByteArrayOutputStream().withStream { os ->
|
||||||
|
exec {
|
||||||
|
commandLine "which", "dx"
|
||||||
|
standardOutput os
|
||||||
|
}
|
||||||
|
rootProject.ext.dxPath = os.toString()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
task dexInJar(type: Jar) {
|
task dexInJar(type: Jar) {
|
||||||
dependsOn jar
|
dependsOn jar
|
||||||
|
dependsOn findDx
|
||||||
doFirst {
|
doFirst {
|
||||||
exec {
|
exec {
|
||||||
workingDir jar.destinationDir
|
workingDir jar.destinationDir
|
||||||
if (OperatingSystem.current().isWindows())
|
if (OperatingSystem.current().isWindows()){
|
||||||
executable "dx.bat"
|
executable "dx.bat"
|
||||||
else
|
|
||||||
executable "dx"
|
|
||||||
args "--dex", "--output", "classes.dex", "${jar.archiveName}"
|
args "--dex", "--output", "classes.dex", "${jar.archiveName}"
|
||||||
|
} else {
|
||||||
|
executable "bash"
|
||||||
|
args rootProject.ext.dxPath.trim(), "--dex", "--output", "classes.dex", "${jar.archiveName}"
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
from "${jar.destinationDir}/classes.dex"
|
from "${jar.destinationDir}/classes.dex"
|
||||||
|
|
|
||||||
|
|
@ -19,11 +19,13 @@ task dexInJar(type: Jar) {
|
||||||
doFirst {
|
doFirst {
|
||||||
exec {
|
exec {
|
||||||
workingDir jar.destinationDir
|
workingDir jar.destinationDir
|
||||||
if (OperatingSystem.current().isWindows())
|
if (OperatingSystem.current().isWindows()){
|
||||||
executable "dx.bat"
|
executable "dx.bat"
|
||||||
else
|
|
||||||
executable "dx"
|
|
||||||
args "--dex", "--output", "classes.dex", "${jar.archiveName}"
|
args "--dex", "--output", "classes.dex", "${jar.archiveName}"
|
||||||
|
} else {
|
||||||
|
executable "bash"
|
||||||
|
args rootProject.ext.dxPath.trim(), "--dex", "--output", "classes.dex", "${jar.archiveName}"
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
from "${jar.destinationDir}/classes.dex"
|
from "${jar.destinationDir}/classes.dex"
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue