From 978fac419fe77ef14c3cb0f09191e67da0f2f8a2 Mon Sep 17 00:00:00 2001
From: Joshua Granick <jgranick@users.noreply.github.com>
Date: Thu, 18 Aug 2016 07:28:33 -0700
Subject: [PATCH] Gradle fix

---
 lime/tools/helpers/AndroidHelper.hx | 34 ++++++++++++++++++-----------
 1 file changed, 21 insertions(+), 13 deletions(-)

diff --git a/lime/tools/helpers/AndroidHelper.hx b/lime/tools/helpers/AndroidHelper.hx
index 57febf76f..8cf21bd3d 100644
--- a/lime/tools/helpers/AndroidHelper.hx
+++ b/lime/tools/helpers/AndroidHelper.hx
@@ -42,8 +42,16 @@ class AndroidHelper {
 			
 		}
 		
-		ProcessHelper.runCommand (projectDirectory, "gradlew", [ task ]);
-		
+		if (PlatformHelper.hostPlatform != Platform.WINDOWS && targetType != "nodejs") {
+			
+			ProcessHelper.runCommand ("", "chmod", [ "755", PathHelper.combine (projectDirectory, "gradlew.sh") ]);
+			ProcessHelper.runCommand (projectDirectory, "./gradlew.sh", [ task ]);
+			
+		} else {
+			
+			ProcessHelper.runCommand (projectDirectory, "gradlew", [ task ]);
+			
+		}
 	}
 	
 	
@@ -116,33 +124,33 @@ class AndroidHelper {
 		adbName = "adb";
 		androidName = "android";
 		emulatorName = "emulator";
-
+		
 		if (PlatformHelper.hostPlatform == Platform.WINDOWS) {
-
+			
 			adbName += ".exe";
 			androidName += ".bat";
 			emulatorName += ".exe";
-
+			
 		}
-
+		
 		if (!FileSystem.exists (adbPath + adbName)) {
-
+			
 			adbPath = project.environment.get ("ANDROID_SDK") + "/platform-tools/";
-
+			
 		}
-
+		
 		if (PlatformHelper.hostPlatform != Platform.WINDOWS) {
-
+			
 			adbName = "./" + adbName;
 			androidName = "./" + androidName;
 			emulatorName = "./" + emulatorName;
-
+			
 		}
 		
 		if (project.environment.exists ("JAVA_HOME")) {
-
+			
 			Sys.putEnv ("JAVA_HOME", project.environment.get ("JAVA_HOME"));
-
+			
 		}
 		
 	}