Commit 2eb84f3

authored

Use the jdkRootPath provided by Unity

Since 2019.3 version, Unity has changed embedded JDK path and provided UnityEditor.Android.AndroidExternalToolsSettings.jdkRootPath API (https://docs.unity3d.com/2019.3/Documentation/ScriptReference/Android.AndroidExternalToolsSettings-jdkRootPath.html). Previous MR(googlesamples#325) wasn't enough to handle embedded JDK path, so I reverted it and changed codes to use Unity API.

1 parent 8b7fb85 commit 2eb84f3Copy full SHA for 2eb84f3

File tree

-7

lines changed

-7

lines changed

Lines changed: 6 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -58,20 +58,19 @@ private static string JavaHome {`
`58`	`58`	`// Unity 2019.x added installation of the JDK in the AndroidPlayer directory`
`59`	`59`	`// so fallback to searching for it there.`
`60`	`60`	`if (String.IsNullOrEmpty(javaHome) \|\| EditorPrefs.GetBool("JdkUseEmbedded")) {`
	`61`	`+#if UNITY_2019_3_OR_NEWER`
	`62`	`+ var openJdkDir = UnityEditor.Android.AndroidExternalToolsSettings.jdkRootPath;`
	`63`	`+ if (Directory.Exists(openJdkDir)) javaHome = openJdkDir;`
	`64`	`+#else`
`61`	`65`	`var androidPlayerDir = PlayServicesResolver.AndroidPlaybackEngineDirectory;`
`62`	`66`	`if (!String.IsNullOrEmpty(androidPlayerDir)) {`
`63`	`67`	`var platformDir = UnityEngine.Application.platform.ToString().Replace(`
`64`	`68`	`"Editor", "").Replace("OSX", "MacOS");`
`65`	`69`	`var openJdkDir = Path.Combine(Path.Combine(Path.Combine(`
`66`	`70`	`androidPlayerDir, "Tools"), "OpenJDK"), platformDir);`
`67`		`- if (Directory.Exists(openJdkDir)) {`
`68`		`- javaHome = openJdkDir;`
`69`		`- }`
`70`		`- else {`
`71`		`- openJdkDir = Path.Combine(androidPlayerDir, "OpenJDK");`
`72`		`- if (Directory.Exists(openJdkDir)) javaHome = openJdkDir;`
`73`		`- }`
	`71`	`+ if (Directory.Exists(openJdkDir)) javaHome = openJdkDir;`
`74`	`72`	`}`
	`73`	`+#endif`
`75`	`74`	`}`
`76`	`75`	`// If the JDK stil isn't found, check the environment.`
`77`	`76`	`if (String.IsNullOrEmpty(javaHome)) {`

Comments

(0)