File tree Expand file tree Collapse file tree 1 file changed +0
-30
lines changed
src/Xamarin.Android.Tools.AndroidSdk/Sdks Expand file tree Collapse file tree 1 file changed +0
-30
lines changed Original file line number Diff line number Diff line change @@ -81,7 +81,6 @@ public override string PreferedJavaSdkPath {
8181 if ( ValidateJavaSdkLocation ( path ) )
8282 return path ;
8383 }
84-
8584 return null ;
8685 }
8786 }
@@ -113,14 +112,6 @@ protected override string GetJavaSdkPath ()
113112 if ( ! string . IsNullOrEmpty ( preferedJavaSdkPath ) )
114113 return preferedJavaSdkPath ;
115114
116- var javaHomeEnv = Environment . GetEnvironmentVariable ( "JAVA_HOME" ) ;
117- if ( ! String . IsNullOrEmpty ( javaHomeEnv ) && ValidateJavaSdkLocation ( javaHomeEnv ) )
118- return javaHomeEnv ;
119-
120- var libExecJavaHome = GetUsrLibExecJavaHomeSdkPath ( ) ;
121- if ( ! String . IsNullOrEmpty ( libExecJavaHome ) && ValidateJavaSdkLocation ( libExecJavaHome ) )
122- return libExecJavaHome ;
123-
124115 // Look in PATH
125116 foreach ( var path in FindExecutableInPath ( JarSigner ) ) {
126117 // Strip off "bin"
@@ -211,27 +202,6 @@ public override void SetPreferredAndroidNdkPath (string path)
211202 SaveConfig ( doc ) ;
212203 }
213204
214- string GetUsrLibExecJavaHomeSdkPath ( )
215- {
216- const string javaHomeExe = "/usr/libexec/java_home" ;
217-
218- if ( File . Exists ( javaHomeExe ) ) {
219- var javaHomeTask = ProcessUtils . ExecuteToolAsync < string > ( javaHomeExe ,
220- ( output ) => {
221- if ( output . Contains ( "(null)" ) ) {
222- return null ;
223- }
224-
225- return output ;
226- } , System . Threading . CancellationToken . None
227- ) ;
228-
229- return javaHomeTask . Result ;
230- }
231-
232- return null ;
233- }
234-
235205 void SaveConfig ( XDocument doc )
236206 {
237207 string cfg = UnixConfigPath ;
You can’t perform that action at this time.
0 commit comments