diff --git a/include/bx/macros.h b/include/bx/macros.h
index c273c8a..08569ba 100644
--- a/include/bx/macros.h
+++ b/include/bx/macros.h
@@ -99,7 +99,7 @@
 #endif // BX_CONFIG_SPSCQUEUE_USE_MUTEX
 
 #ifndef BX_CONFIG_CRT_FILE_READER_WRITER
-#	define BX_CONFIG_CRT_FILE_READER_WRITER BX_PLATFORM_WINDOWS|BX_PLATFORM_LINUX|BX_PLATFORM_OSX
+#	define BX_CONFIG_CRT_FILE_READER_WRITER BX_PLATFORM_WINDOWS|BX_PLATFORM_LINUX|BX_PLATFORM_OSX|BX_PLATFORM_QNX
 #endif // BX_CONFIG_CRT_FILE_READER_WRITER
 
 #endif // __BX_MACROS_H__
diff --git a/premake/toolchain.lua b/premake/toolchain.lua
index 441e534..0790b55 100755
--- a/premake/toolchain.lua
+++ b/premake/toolchain.lua
@@ -12,6 +12,7 @@ function toolchain(_buildDir, _libDir)
 		value = "GCC",
 		description = "Choose GCC flavor",
 		allowed = {
+			{ "android-arm", "Android - ARM" },
 			{ "emscripten", "Emscripten" },
 			{ "linux", "Linux" },
 			{ "mingw", "MinGW" },
@@ -26,9 +27,6 @@ function toolchain(_buildDir, _libDir)
 	-- Avoid error when invoking premake4 --help.
 	if (_ACTION == nil) then return end
 
-	local XEDK = os.getenv("XEDK")
-	if not XEDK then XEDK = "<you must install XBOX SDK>" end
-
 	location (_buildDir .. "projects/" .. _ACTION)
 
 	if _ACTION == "clean" then
@@ -46,6 +44,18 @@ function toolchain(_buildDir, _libDir)
 			"ExtraWarnings",
 		}
 
+		if "android-arm" == _OPTIONS["gcc"] then
+
+			if not os.getenv("ANDROID_NDK") or not os.getenv("ANDROID_NDK_PLATFORM") then
+				print("Set ANDROID_NDK and ANDROID_NDK_PLATFORM envrionment variables.")
+			end
+
+			premake.gcc.cc = "$(ANDROID_NDK)/bin/arm-linux-androideabi-gcc"
+			premake.gcc.cxx = "$(ANDROID_NDK)/bin/arm-linux-androideabi-g++"
+			premake.gcc.ar = "$(ANDROID_NDK)/bin/arm-linux-androideabi-ar"
+			location (_buildDir .. "projects/" .. _ACTION .. "-android-arm")
+		end
+
 		if "emscripten" == _OPTIONS["gcc"] then
 
 			if not os.getenv("EMSCRIPTEN") then
@@ -250,6 +260,21 @@ function toolchain(_buildDir, _libDir)
 			"-m64",
 		}
 
+	configuration { "android-arm" }
+		targetdir (_buildDir .. "android-arm" .. "/bin")
+		objdir (_buildDir .. "android-arm" .. "/obj")
+		libdirs { _libDir .. "lib/android-arm" }
+		includedirs {
+			"$(ANDROID_NDK_PLATFORM)/platforms/android-14/arch-arm/usr/include",
+			"$(ANDROID_NDK_PLATFORM)/sources/cxx-stl/stlport/stlport",
+			"$(ANDROID_NDK_PLATFORM)/sources/cxx-stl/gabi++/include",
+		}
+		buildoptions {
+			"-std=c++0x",
+			"-U__STRICT_ANSI__",
+			"-Wno-psabi", -- note: the mangling of 'va_list' has changed in GCC 4.4.0
+		}
+
 	configuration { "emscripten" }
 		targetdir (_buildDir .. "emscripten" .. "/bin")
 		objdir (_buildDir .. "emscripten" .. "/obj")
@@ -361,15 +386,15 @@ function toolchain(_buildDir, _libDir)
 		includedirs { bxDir .. "include/compat/osx" }
 
 	configuration { "qnx-arm" }
+		targetdir (_buildDir .. "qnx-arm" .. "/bin")
+		objdir (_buildDir .. "qnx-arm" .. "/obj")
+		libdirs { _libDir .. "lib/qnx-arm" }
 --		includedirs { bxDir .. "include/compat/qnx" }
 		buildoptions {
 			"-std=c++0x",
 			"-U__STRICT_ANSI__",
 			"-Wno-psabi", -- note: the mangling of 'va_list' has changed in GCC 4.4.0
 		}
-		targetdir (_buildDir .. "qnx-arm" .. "/bin")
-		objdir (_buildDir .. "qnx-arm" .. "/obj")
-		libdirs { _libDir .. "lib/qnx-arm" }
 
 	configuration {} -- reset configuration
 end