diff --git a/SPD-classes/build.gradle b/SPD-classes/build.gradle
index 7d8eec825..92c3492cf 100644
--- a/SPD-classes/build.gradle
+++ b/SPD-classes/build.gradle
@@ -8,20 +8,25 @@ android {
         description "builds JNI libs from source. " +
                 "This requires the Android NDK and is optional as precompiled libs are provided."
 
-        workingDir = "./src/main"
+        def root = project(':SPD-classes').projectDir
         def ndkDir = android.ndkDirectory
 
-        //Need to start cmd first on windows systems, otherwise these are the same
+        //Need to execute through cmd on windows systems
         if (System.properties["os.name"].toLowerCase().contains("windows")){
-            commandLine "cmd", "/c" , "$ndkDir${File.separator}ndk-build " +
-                    "NDK_APPLICATION_MK=./jniSources/Application.mk " +
-                    "NDK_LIBS_OUT=./jniLibs"
+            executable "cmd"
+            args "/c", "$ndkDir${File.separator}ndk-build",
+                    "NDK_PROJECT_PATH=$root/src/main/jniSources",
+                    "NDK_APPLICATION_MK=$root/src/main/jniSources/Application.mk",
+                    "APP_BUILD_SCRIPT=$root/src/main/jniSources/Android.mk",
+                    "NDK_LIBS_OUT=$root/src/main/jniLibs"
+
         } else {
-            commandLine "$ndkDir${File.separator}ndk-build " +
-                    "NDK_APPLICATION_MK=./jniSources/Application.mk " +
-                    "NDK_LIBS_OUT=./jniLibs"
+            executable "$ndkDir/ndk-build"
+            args "NDK_PROJECT_PATH=$root/src/main/jniSources",
+                    "NDK_APPLICATION_MK=$root/src/main/jniSources/Application.mk",
+                    "APP_BUILD_SCRIPT=$root/src/main/jniSources/Android.mk",
+                    "NDK_LIBS_OUT=$root/src/main/jniLibs"
+
         }
-
     }
-
 }
\ No newline at end of file
diff --git a/SPD-classes/src/main/jniLibs/armeabi/libFroyoGLES20Fix.so b/SPD-classes/src/main/jniLibs/armeabi/libFroyoGLES20Fix.so
index c71ffc321..6f232486e 100644
Binary files a/SPD-classes/src/main/jniLibs/armeabi/libFroyoGLES20Fix.so and b/SPD-classes/src/main/jniLibs/armeabi/libFroyoGLES20Fix.so differ
diff --git a/SPD-classes/src/main/jniLibs/x86/libFroyoGLES20Fix.so b/SPD-classes/src/main/jniLibs/x86/libFroyoGLES20Fix.so
index 9e0647f80..0cf1eced0 100644
Binary files a/SPD-classes/src/main/jniLibs/x86/libFroyoGLES20Fix.so and b/SPD-classes/src/main/jniLibs/x86/libFroyoGLES20Fix.so differ
diff --git a/SPD-classes/src/main/jniSources/Application.mk b/SPD-classes/src/main/jniSources/Application.mk
index e2b8a6ef6..e40f0baf5 100644
--- a/SPD-classes/src/main/jniSources/Application.mk
+++ b/SPD-classes/src/main/jniSources/Application.mk
@@ -1,3 +1,3 @@
 APP_ABI := armeabi x86
-APP_BUILD_SCRIPT := ./jniSources/Android.mk
-APP_OPTIM := release
\ No newline at end of file
+APP_OPTIM := release
+APP_PLATFORM := android-8
\ No newline at end of file