From 84d1260efcc53aaac8d550cf8073056bc3bcb65f Mon Sep 17 00:00:00 2001
From: klugier <klugier@f0d560ea-af0d-0410-9eb7-867de7ffcac7>
Date: Sun, 29 Jan 2017 19:51:39 +0000
Subject: [PATCH] Android can be treated as regular host - thanks SenderGhost!

git-svn-id: svn://ultimatepp.org/upp/trunk@10798 f0d560ea-af0d-0410-9eb7-867de7ffcac7
---
 uppsrc/ide/Android/AndroidSDK.cpp      |  2 --
 uppsrc/ide/Builders/AndroidBuilder.cpp |  2 +-
 uppsrc/ide/Core/Host.cpp               | 14 +++++++++-----
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/uppsrc/ide/Android/AndroidSDK.cpp b/uppsrc/ide/Android/AndroidSDK.cpp
index 86fe04c71..c13d8617b 100644
--- a/uppsrc/ide/Android/AndroidSDK.cpp
+++ b/uppsrc/ide/Android/AndroidSDK.cpp
@@ -11,7 +11,6 @@ String AndroidSDK::GetDownloadUrl()
 
 AndroidSDK::AndroidSDK()
 {
-	
 }
 
 AndroidSDK::AndroidSDK(const String& path, bool deduceValues)
@@ -23,7 +22,6 @@ AndroidSDK::AndroidSDK(const String& path, bool deduceValues)
 
 AndroidSDK::~AndroidSDK()
 {
-	
 }
 
 void AndroidSDK::DeducePathReleatedValues()
diff --git a/uppsrc/ide/Builders/AndroidBuilder.cpp b/uppsrc/ide/Builders/AndroidBuilder.cpp
index c54890af8..c73499471 100644
--- a/uppsrc/ide/Builders/AndroidBuilder.cpp
+++ b/uppsrc/ide/Builders/AndroidBuilder.cpp
@@ -313,8 +313,8 @@ bool AndroidBuilder::Preprocess(
 
 void AndroidBuilder::AddFlags(Index<String>& cfg)
 {
-	cfg.Add("LINUX");
 	cfg.Add("POSIX");
+	cfg.Add("LINUX");
 	cfg.Add("ANDROID");
 }
 
diff --git a/uppsrc/ide/Core/Host.cpp b/uppsrc/ide/Core/Host.cpp
index eb7fc0b44..a1587ceb4 100644
--- a/uppsrc/ide/Core/Host.cpp
+++ b/uppsrc/ide/Core/Host.cpp
@@ -322,12 +322,16 @@ void LocalHost::AddFlags(Index<String>& cfg)
 	cfg.Add("WIN32");
 #endif
 
+#ifdef PLATFORM_POSIX
+	cfg.Add("POSIX");
+#endif
+
 #ifdef PLATFORM_LINUX
 	cfg.Add("LINUX");
 #endif
 
-#ifdef PLATFORM_POSIX
-	cfg.Add("POSIX");
+#ifdef PLATFORM_ANDROID
+	cfg.Add("ANDROID");
 #endif
 
 #ifdef PLATFORM_BSD
@@ -362,15 +366,15 @@ void LocalHost::AddFlags(Index<String>& cfg)
 bool LocalHost::HasPlatformFlag(const Index<String>& cfg)
 {
 	static const Index<String> platformFlags = {
-		"ANDROID", "WIN32", "LINUX", "POSIX",
+		"WIN32", "POSIX", "LINUX", "ANDROID",
 		"BSD", "FREEBSD", "OPENBSD", "NETBSD",
 		"DRAGONFLY", "SOLARIS", "OSX11"
 	};
-	
+
 	for(const String& flag : cfg)
 		if(platformFlags.Find(flag) >= 0)
 			return true;
-		
+
 	return false;
 }