Commits

Matthew Moses committed 5ad8cdd

Don't set JAVA_HOME.

JAVA_HOME should be set manually and persisted for the current user.
Otherwise, the Android SDK Tools will not properly locate the 64-bit JDK.

Comments (0)

Files changed (1)

Microsoft.PowerShell_profile.ps1

 $Env:ANDROID_HOME = (
     Get-ItemProperty 'HKLM:\SOFTWARE\Wow6432Node\Android SDK Tools' Path).Path
-$Env:JAVA_HOME = (
-    Get-ItemProperty 'HKLM:\SOFTWARE\JavaSoft\Java Development Kit\1.7' JavaHome).JavaHome
+# JAVA_HOME needs to be set outside of PowerShell so the Android SDK Tools
+# can find the 64-bit JDK properly.
+#$Env:JAVA_HOME = (
+#    Get-ItemProperty 'HKLM:\SOFTWARE\JavaSoft\Java Development Kit\1.7' JavaHome).JavaHome
 $Env:PYTHON_HOME = (
     Get-ItemProperty 'HKLM:\SOFTWARE\Python\PythonCore\3.3\InstallPath').'(default)'
 $Env:PATH = (