diff --git a/Core/Debugger.cpp b/Core/Debugger.cpp
index 8edb0b12..6b06960e 100644
--- a/Core/Debugger.cpp
+++ b/Core/Debugger.cpp
@@ -26,6 +26,10 @@
 #include "DebugHud.h"
 #include "StandardController.h"
 
+#ifndef UINT32_MAX
+#define UINT32_MAX  ((uint32_t)-1)
+#endif
+
 Debugger* Debugger::Instance = nullptr;
 const int Debugger::BreakpointTypeCount;
 string Debugger::_disassemblerOutput = "";
@@ -1357,4 +1361,4 @@ void Debugger::GetDebugEvents(uint32_t* pictureBuffer, DebugEventInfo *infoArray
 uint32_t Debugger::GetDebugEventCount()
 {
 	return (uint32_t)_debugEvents.size();
-}
\ No newline at end of file
+}
diff --git a/Libretro/jni/Android.mk b/Libretro/jni/Android.mk
new file mode 100644
index 00000000..edd6463e
--- /dev/null
+++ b/Libretro/jni/Android.mk
@@ -0,0 +1,41 @@
+LOCAL_PATH := $(call my-dir)
+
+LIBRETRO_DIR    += ../
+SEVENZIP_DIR    += ../../SevenZip
+LUA_DIR         += ../../Lua
+CORE_DIR        += ../../Core
+UTIL_DIR        += ../../Utilities
+
+GIT_VERSION ?= " $(shell git rev-parse --short HEAD || echo unknown)"
+ifneq ($(GIT_VERSION)," unknown")
+   LOCAL_CXXFLAGS += -DGIT_VERSION=\"$(GIT_VERSION)\"
+endif
+
+include $(CLEAR_VARS)
+
+HAVE_NETWORK = 1
+LOCAL_MODULE    := libretro
+
+ifeq ($(TARGET_ARCH),arm)
+LOCAL_CXXFLAGS += -DANDROID_ARM
+LOCAL_ARM_MODE := arm
+endif
+
+ifeq ($(TARGET_ARCH),x86)
+LOCAL_CXXFLAGS +=  -DANDROID_X86
+endif
+
+ifeq ($(TARGET_ARCH),mips)
+LOCAL_CXXFLAGS += -DANDROID_MIPS
+endif
+
+include ../Makefile.common
+
+LOCAL_SRC_FILES := $(SOURCES_CXX) $(SOURCES_C)
+LOCAL_CFLAGS += -DINLINE=inline -DHAVE_STDINT_H -DHAVE_INTTYPES_H -DLIBRETRO -DNDEBUG -D_USE_MATH_DEFINES -I$(CORE_DIR) -DDISABLE_DEBUGGER -DDISABLE_TIMEKEEPING -Wno-multichar
+LOCAL_CXXFLAGS += -DINLINE=inline -DHAVE_STDINT_H -DHAVE_INTTYPES_H -DLIBRETRO -DNDEBUG -D_USE_MATH_DEFINES -I$(CORE_DIR) -DDISABLE_DEBUGGER -DDISABLE_TIMEKEEPING -Wno-multichar -std=c++11 -frtti -fexceptions
+LOCAL_C_INCLUDES = $(INCFLAGS)
+LOCAL_CXX_INCLUDES = $(INCFLAGS)
+
+include $(BUILD_SHARED_LIBRARY)
+
diff --git a/Libretro/jni/Application.mk b/Libretro/jni/Application.mk
new file mode 100644
index 00000000..dec3cc76
--- /dev/null
+++ b/Libretro/jni/Application.mk
@@ -0,0 +1,2 @@
+APP_STL:=c++_static
+APP_ABI := all