From e740bb69157a01f928c37a404aece45835d66f3d Mon Sep 17 00:00:00 2001
From: Miodrag Milanovic <mmicko@gmail.com>
Date: Fri, 26 Feb 2016 08:20:30 +0100
Subject: [PATCH] Fixing some more Android related things (nw)

---
 makefile                 |  6 +++---
 scripts/genie.lua        |  9 ++++-----
 scripts/src/3rdparty.lua | 24 ++++++++++++++++++++----
 scripts/toolchain.lua    |  1 +
 4 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/makefile b/makefile
index ad552c120db..49b39e04f20 100644
--- a/makefile
+++ b/makefile
@@ -938,7 +938,7 @@ ifndef ANDROID_NDK_ROOT
 	$(error ANDROID_NDK_ROOT is not set)
 endif
 ifndef COMPILE
-	$(SILENT) $(GENIE) $(PARAMS) --gcc=android-arm --gcc_version=4.9 --osd=osdmini --targetos=android-arm --PLATFORM=arm --NOASM=1 gmake
+	$(SILENT) $(GENIE) $(PARAMS) --gcc=android-arm --gcc_version=4.9 --osd=osdmini --targetos=android-arm --targetos=android --PLATFORM=arm --NOASM=1 gmake
 endif
 	$(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR_MINI)/gmake-android-arm config=$(CONFIG) precompile
 	$(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR_MINI)/gmake-android-arm config=$(CONFIG)
@@ -952,7 +952,7 @@ ifndef ANDROID_NDK_ROOT
 	$(error ANDROID_NDK_ROOT is not set)
 endif
 ifndef COMPILE
-	$(SILENT) $(GENIE) $(PARAMS) --gcc=android-mips --gcc_version=4.9 --osd=osdmini --targetos=android-mips --PLATFORM=mips --NOASM=1 gmake
+	$(SILENT) $(GENIE) $(PARAMS) --gcc=android-mips --gcc_version=4.9 --osd=osdmini --targetos=android-mips --targetos=android --PLATFORM=mips --NOASM=1 gmake
 endif
 	$(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR_MINI)/gmake-android-mips config=$(CONFIG) precompile
 	$(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR_MINI)/gmake-android-mips config=$(CONFIG)
@@ -966,7 +966,7 @@ ifndef ANDROID_NDK_ROOT
 	$(error ANDROID_NDK_ROOT is not set)
 endif
 ifndef COMPILE
-	$(SILENT) $(GENIE) $(PARAMS) --gcc=android-x86 --gcc_version=4.9 --osd=osdmini --targetos=android-x86 --PLATFORM=x86 gmake
+	$(SILENT) $(GENIE) $(PARAMS) --gcc=android-x86 --gcc_version=4.9 --osd=osdmini --targetos=android-x86 --targetos=android --PLATFORM=x86 gmake
 endif
 	$(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR_MINI)/gmake-android-x86 config=$(CONFIG) precompile
 	$(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR_MINI)/gmake-android-x86 config=$(CONFIG)
diff --git a/scripts/genie.lua b/scripts/genie.lua
index 5f226315e47..e490701e9e9 100644
--- a/scripts/genie.lua
+++ b/scripts/genie.lua
@@ -98,15 +98,11 @@ newoption {
 	trigger = "targetos",
 	description = "Choose target OS",
 	allowed = {
-		{ "android-arm",   "Android - ARM"          },
-		{ "android-mips",  "Android - MIPS"         },
-		{ "android-x86",   "Android - x86"          },
+		{ "android",  	   "Android" 	            },
 		{ "asmjs",         "Emscripten/asm.js"      },
 		{ "freebsd",       "FreeBSD"                },
 		{ "netbsd",        "NetBSD"                 },
 		{ "openbsd",       "OpenBSD"                },
-		{ "nacl",          "Native Client"          },
-		{ "nacl-arm",      "Native Client - ARM"    },
 		{ "pnacl",         "Native Client - PNaCl"  },
 		{ "linux",     	   "Linux"                  },
 		{ "ios",           "iOS"                    },
@@ -1035,6 +1031,9 @@ configuration { "android*" }
 		"-Wno-tautological-constant-out-of-range-compare",
 		"-Wno-tautological-pointer-compare",
 	}
+	defines {
+		"_POSIX_BARRIERS=1",
+	}	
 	archivesplit_size "20"
 
 configuration { "pnacl" }
diff --git a/scripts/src/3rdparty.lua b/scripts/src/3rdparty.lua
index 36547209ac7..cfaa171bf64 100644
--- a/scripts/src/3rdparty.lua
+++ b/scripts/src/3rdparty.lua
@@ -523,10 +523,7 @@ project "luv"
 			"_WIN32_WINNT=0x0600",
 		}
 	end
-	configuration { "pnacl"}
-		defines {
-			"_POSIX_BARRIERS=1",
-		}
+
 	configuration { "vs*" }
 		buildoptions {
 			"/wd4244", -- warning C4244: 'argument' : conversion from 'xxx' to 'xxx', possible loss of data
@@ -1159,6 +1156,25 @@ project "uv"
 			MAME_DIR .. "3rdparty/libuv/src/unix/proctitle.c",
 		}
 	end
+			
+	if _OPTIONS["targetos"]=="android" then
+		defines {
+			"_GNU_SOURCE",
+		}
+		buildoptions {
+			"-Wno-header-guard",
+		}
+		files {
+			MAME_DIR .. "3rdparty/libuv/src/unix/proctitle.c",
+			MAME_DIR .. "3rdparty/libuv/src/unix/linux-core.c",
+			MAME_DIR .. "3rdparty/libuv/src/unix/linux-inotify.c",
+			MAME_DIR .. "3rdparty/libuv/src/unix/linux-syscalls.c",
+			MAME_DIR .. "3rdparty/libuv/src/unix/linux-syscalls.h",
+			MAME_DIR .. "3rdparty/libuv/src/unix/pthread-fixes.c",
+			MAME_DIR .. "3rdparty/libuv/src/unix/android-ifaddrs.c",
+		}
+	end
+			
 	if _OPTIONS["targetos"]=="solaris" then
 		defines {
 			"__EXTENSIONS__",
diff --git a/scripts/toolchain.lua b/scripts/toolchain.lua
index 058c10a4bcc..95fe72f618b 100644
--- a/scripts/toolchain.lua
+++ b/scripts/toolchain.lua
@@ -649,6 +649,7 @@ function toolchain(_buildDir, _subDir)
 			"m",
 			"android",
 			"log",
+			"c++_static",
 			"gcc",
 		}
 		buildoptions {