From 88bf7166634dbea55b375a94eae549e5b8b52fb2 Mon Sep 17 00:00:00 2001
From: Shauli Bracha <shauli.bracha@hotmail.com>
Date: Wed, 27 Mar 2019 09:40:41 +0200
Subject: [PATCH] Fixed building on Windows environment

---
 dalvikdx/build.gradle | 6 +++++-
 dexmaker/build.gradle | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/dalvikdx/build.gradle b/dalvikdx/build.gradle
index 5d64c3a3..b031d497 100644
--- a/dalvikdx/build.gradle
+++ b/dalvikdx/build.gradle
@@ -1,3 +1,4 @@
+import org.gradle.internal.os.OperatingSystem
 apply plugin: 'java-library'
 
 dependencies {
@@ -13,7 +14,10 @@ task dexInJar(type: Jar) {
     doFirst {
         exec {
             workingDir jar.destinationDir
-            executable "dx"
+            if (OperatingSystem.current().isWindows())
+                executable "dx.bat"
+            else
+                executable "dx"
             args "--dex", "--output", "classes.dex", "${jar.archiveName}"
         }
     }
diff --git a/dexmaker/build.gradle b/dexmaker/build.gradle
index 319198e1..8642d24e 100644
--- a/dexmaker/build.gradle
+++ b/dexmaker/build.gradle
@@ -1,3 +1,4 @@
+import org.gradle.internal.os.OperatingSystem
 apply plugin: 'java'
 
 description = "A utility for doing compile or runtime code generation targeting Android's Dalvik VM"
@@ -18,7 +19,10 @@ task dexInJar(type: Jar) {
     doFirst {
         exec {
             workingDir jar.destinationDir
-            executable "dx"
+            if (OperatingSystem.current().isWindows())
+                executable "dx.bat"
+            else
+                executable "dx"
             args "--dex", "--output", "classes.dex", "${jar.archiveName}"
         }
     }