From 2dfcea4e060591f29fd1bbabb1bd5c44f62b21de Mon Sep 17 00:00:00 2001
From: klugier <klugier@f0d560ea-af0d-0410-9eb7-867de7ffcac7>
Date: Mon, 6 Jul 2015 21:03:22 +0000
Subject: [PATCH] .android_builder fix issue with moveing file into android
 project

git-svn-id: svn://ultimatepp.org/upp/trunk@8637 f0d560ea-af0d-0410-9eb7-867de7ffcac7
---
 uppsrc/ide/Builders/AndroidBuilder.icpp | 11 ++++++-----
 uppsrc/ide/Builders/init                |  5 +++++
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/uppsrc/ide/Builders/AndroidBuilder.icpp b/uppsrc/ide/Builders/AndroidBuilder.icpp
index c1e728fc8..ec2e3cac0 100644
--- a/uppsrc/ide/Builders/AndroidBuilder.icpp
+++ b/uppsrc/ide/Builders/AndroidBuilder.icpp
@@ -371,17 +371,18 @@ void AndroidBuilder::CleanPackage(const String& package)
 		DeleteFolderDeep(sandboxDir);
 }
 
-bool AndroidBuilder::MovePackageFileToAndroidProject(const String& src, const String& dest)
+bool AndroidBuilder::MovePackageFileToAndroidProject(const String& src, const String& dst)
 {
-	if(!RealizeDirectory(GetFileDirectory(dest)))
+	if(!RealizeDirectory(GetFileDirectory(dst)))
 		return false;
 	
-	if(FileExists(dest)) {
-		if(GetFileTime(src).Get() <= GetFileTime(dest).Get())
+	if(FileExists(dst)) {
+		if(GetFileTime(dst) > GetFileTime(src))
 			return true;
 	}
+	SaveFile(dst, LoadFile(src));
 	
-	return FileCopy(src, dest);
+	return true;
 }
 
 bool AndroidBuilder::RealizePackageSourcesDirectory(const String& packageName)
diff --git a/uppsrc/ide/Builders/init b/uppsrc/ide/Builders/init
index 40b41be61..e3658a610 100644
--- a/uppsrc/ide/Builders/init
+++ b/uppsrc/ide/Builders/init
@@ -1,6 +1,8 @@
 #ifndef _ide_Builders_icpp_init_stub
 #define _ide_Builders_icpp_init_stub
 #include "ide\Core/init"
+#include "ide/Android/init"
+#include "ide/Java/init"
 #define BLITZ_INDEX__ Fab5aa4644e1c1b5af8ed5faf2d4db317
 #include "GccBuilder.icpp"
 #undef BLITZ_INDEX__
@@ -13,6 +15,9 @@
 #define BLITZ_INDEX__ Fecf66fc39eec6a21e32d6c41cad4d431
 #include "JavaBuilder.icpp"
 #undef BLITZ_INDEX__
+#define BLITZ_INDEX__ Fea8152e4f0407437ab942dc131a5c47f
+#include "AndroidBuilder.icpp"
+#undef BLITZ_INDEX__
 #define BLITZ_INDEX__ Fa99182ca8dccb6e49a9bb75dbfd7c33d
 #include "ScriptBuilder.icpp"
 #undef BLITZ_INDEX__