From e9e5d0455cb6fbfc6d5abcb04795998169ebc9fc Mon Sep 17 00:00:00 2001
From: unace <unace2u@gmail.com>
Date: Sun, 16 Feb 2020 22:13:51 -0800
Subject: [PATCH] Unity OpenJDK path changed (2019.3.0, 2019.3.1)

add some lines to handle a new Unity OpenJDK path.
before
/Applications/Unity/Hub/Editor/{UnityVersion}/PlaybackEngines/AndroidPlayer/Tools/OpenJDK/{platform}
after
/Applications/Unity/Hub/Editor/{UnityVersion}/PlaybackEngines/AndroidPlayer/OpenJDK/
---
 source/PlayServicesResolver/src/JavaUtilities.cs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/source/PlayServicesResolver/src/JavaUtilities.cs b/source/PlayServicesResolver/src/JavaUtilities.cs
index 0c574bf5..2a4b49b6 100644
--- a/source/PlayServicesResolver/src/JavaUtilities.cs
+++ b/source/PlayServicesResolver/src/JavaUtilities.cs
@@ -64,7 +64,13 @@ private static string JavaHome {
                             "Editor", "").Replace("OSX", "MacOS");
                         var openJdkDir = Path.Combine(Path.Combine(Path.Combine(
                             androidPlayerDir, "Tools"), "OpenJDK"), platformDir);
-                        if (Directory.Exists(openJdkDir)) javaHome = openJdkDir;
+                        if (Directory.Exists(openJdkDir)) {
+                            javaHome = openJdkDir;
+                        }
+                        else {
+                            openJdkDir = Path.Combine(androidPlayerDir, "OpenJDK");
+                            if (Directory.Exists(openJdkDir)) javaHome = openJdkDir;
+                        }
                     }
                 }
                 // If the JDK stil isn't found, check the environment.