From b65e7beea4e122007d73fbefa76f4b4dcf6869ba Mon Sep 17 00:00:00 2001
From: RPG3D <imxqliu@live.com>
Date: Tue, 18 Feb 2020 16:46:54 -0500
Subject: [PATCH] Ignore empty AAR directories on Android (contributed by
 RPG3D)

#jira UE-88492
#PR #6676
#ue4
#android
#rb trivial

[CL 11520899 by Chris Babcock in 4.25 branch]
---
 .../Platform/Android/AndroidAARHandler.cs     | 35 +++++++++++--------
 1 file changed, 21 insertions(+), 14 deletions(-)

diff --git a/Engine/Source/Programs/UnrealBuildTool/Platform/Android/AndroidAARHandler.cs b/Engine/Source/Programs/UnrealBuildTool/Platform/Android/AndroidAARHandler.cs
index 2e767366e6cf..367f54569b94 100644
--- a/Engine/Source/Programs/UnrealBuildTool/Platform/Android/AndroidAARHandler.cs
+++ b/Engine/Source/Programs/UnrealBuildTool/Platform/Android/AndroidAARHandler.cs
@@ -80,26 +80,33 @@ namespace UnrealBuildTool
 		/// <param name="SearchPattern">Search pattern to match</param>
 		public void AddRepositories(string RepositoryPath, string SearchPattern)
 		{
-			List<string> ToCheck = new List<string>();
-			ToCheck.Add(RepositoryPath);
-			while (ToCheck.Count > 0)
+			if (Directory.Exists(RepositoryPath))
 			{
-				int LastIndex = ToCheck.Count - 1;
-				string CurrentDir = ToCheck[LastIndex];
-				ToCheck.RemoveAt(LastIndex);
-				foreach (string SearchPath in Directory.GetDirectories(CurrentDir))
+				List<string> ToCheck = new List<string>();
+				ToCheck.Add(RepositoryPath);
+				while (ToCheck.Count > 0)
 				{
-					if (SearchPath.Contains(SearchPattern))
+					int LastIndex = ToCheck.Count - 1;
+					string CurrentDir = ToCheck[LastIndex];
+					ToCheck.RemoveAt(LastIndex);
+					foreach (string SearchPath in Directory.GetDirectories(CurrentDir))
 					{
-						Log.TraceInformation("Added repository: {0}", SearchPath);
-						Repositories.Add(SearchPath);
-					}
-					else
-					{
-						ToCheck.Add(SearchPath);
+						if (SearchPath.Contains(SearchPattern))
+						{
+							Log.TraceInformation("Added repository: {0}", SearchPath);
+							Repositories.Add(SearchPath);
+						}
+						else
+						{
+							ToCheck.Add(SearchPath);
+						}
 					}
 				}
 			}
+			else
+			{
+				Log.TraceInformation("AddRepositories: Directory {0} not found; ignored", RepositoryPath);
+			}
 		}
 
 		public void DumpAAR()