diff --git a/libs/openFrameworksCompiled/project/android/cmake.sh b/libs/openFrameworksCompiled/project/android/cmake.sh
index d5db289b62e..0ee30380e0c 100755
--- a/libs/openFrameworksCompiled/project/android/cmake.sh
+++ b/libs/openFrameworksCompiled/project/android/cmake.sh
@@ -116,7 +116,7 @@ for ARCHE in $ARCH; do
     -DCONFIGURATION_BUILD_DIR="$OUTPUT_DIR" \
     "$CMAKELISTS_DIR"
 
-  ninja -j "$NUM_CORES"
+  $NINJA_PATH -j "$NUM_CORES"
 
   cd "$SCRIPT_DIR"
 done
diff --git a/scripts/templates/android/ofApp/build.gradle b/scripts/templates/android/ofApp/build.gradle
index 49249d61b92..46386ce67e1 100644
--- a/scripts/templates/android/ofApp/build.gradle
+++ b/scripts/templates/android/ofApp/build.gradle
@@ -29,7 +29,7 @@ def addonFile = new File(projectRoot, "addons.make")
 def addonPaths = []
 if (addonFile.exists()) {
 	addonFile.eachLine { line ->
-		def addonPath = ofRoot + "addons/" + line
+		def addonPath = ofRoot() + "addons/" + line
 		if (new File(addonPath).exists()) {
 			addonPaths.add(addonPath)
 		}
@@ -237,15 +237,9 @@ task checkAndBuildOF {
         knownABIs.each { arch ->
             if (!doesOFSoFileExist(arch)) {
                 println "openFrameworks library missing for $arch! Running CMake build..."
-                if(isWindows) {
-                    exec {
-                        commandLine '"C:\\Program Files\\Git\\bin\\bash.exe"'
-                        args cmakeScriptPath
-                    }
-                } else {
-                    exec {
-                        commandLine 'bash', cmakeScriptPath
-                    }
+                exec {
+                    commandLine gitBashPath
+                    args cmakeScriptPath
                 }
             } else {
                 println "openFrameworks library exists for $arch"