Remove OracleJDK. Not necessary anymore

Removed OracleJDK. Its licensing has gotten unfriendly and AndroidStudio already has OpenJDK bundled to make startup easier. Therefore I think we can let Oracle go.

Author: hhocker

AndroidStudioPortable-Definitions.ps1

@@ -67,21 +67,7 @@ $AndroidStudioBatchFile =
 $GradleUserHomeDirectory =
     "$PortableHomeDirectory\.gradle"
 
-## OpenJDK Java binaries 
-$OpenJDK =
-    'OpenJDK8U-jdk_x64_windows_hotspot_8u202b08'
-$OpenJDKName = 
-	'jdk8u202-b08'
-#Should Autogenerate from above	
-$OpenJDKArchive =
-    "$OpenJDK.zip"
-$OpenJDKURL =
-    "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/$OpenJDKName/$OpenJDKArchive"
-$OpenJDKDirectory =
-    ".\$OpenJDKName"
-$OpenJDKBinariesDirectory =
-"$OpenJDKDirectory\bin"
-
+	
 ### Tools Section. Shouldnt need to change ##
 
 ##7z File Expander

Remove-AndroidStudioPortable.ps1

@@ -32,8 +32,6 @@ $AndroidSDKRootDirectory =
     Get-RelativeRootDirectory -RelativePath $AndroidSDKDirectory
 $AndroidStudioRootDirectory =
     Get-RelativeRootDirectory -RelativePath $AndroidStudioDirectory
-$OracleJDKRootDirectory =
-    Get-RelativeRootDirectory -RelativePath $OracleJDKDirectory
 
 #
 # 260 characters workaround
@@ -46,8 +44,7 @@ $OracleJDKRootDirectory =
 
 $InstalledPackages = @(
     $AndroidSDKRootDirectory,
-    $AndroidStudioRootDirectory,
-    $OracleJDKRootDirectory
+    $AndroidStudioRootDirectory
 )
 
 $RemoveItemParameters = @{

Remove-SetupTemporaryFiles.ps1

@@ -10,9 +10,7 @@ $TemporaryFiles = @(
     $7zBootStrapExec,
     $7zInstaller,
     $7zExecutable,
-    $AndroidStudioArchive,
-    $OracleJDKInstaller,
-	$OracleJDKInternalArchive
+    $AndroidStudioArchive
 )
 
 $RemoveItemParameters = @{

Setup-AndroidStudioPortable.ps1

@@ -34,8 +34,7 @@
 
 $ToolsAreRequired =
     !(Test-Path -Path $AndroidSDKDirectory)    -Or
-    !(Test-Path -Path $AndroidStudioDirectory) -Or
-    !(Test-Path -Path $OracleJDKDirectory)
+    !(Test-Path -Path $AndroidStudioDirectory)
 
 if ($ToolsAreRequired -And !(Test-Path -Path $aria2Directory))
 {
@@ -81,81 +80,6 @@ if (!(Test-Path -Path $AndroidStudioDirectory))
     & ".\$7zExecutable" 'x' $AndroidStudioArchive '-o*' '-bso0' '-bsp1' '-y'
 }
 
-#
-# Download and unpack an Oracle JDK installer without administrative rights.
-#
-
-if (!(Test-Path -Path $OracleJDKDirectory))
-{
-    if (!(Test-Path -Path $OracleJDKInternalArchive))
-    {
-        if (!(Test-Path -Path $OracleJDKInternalCAB))
-        {
-            if (!(Test-Path -Path $OracleJDKInstaller))
-            {
-                #
-                # Download the Oracle JDK installer accepting the
-                #
-                #     `Oracle Binary Code License Agreement for Java SE`
-                #
-
-				& ".\$aria2Directory\$aria2Executable" --header=$($OracleJDKdlCookie) -c -o $OracleJDKInstaller $OracleJDKURL
-                
-            }
-
-            #
-            # Unpack the Oracle JDK installer with 7-Zip.
-            #
-
-            Write-Output "Unpack JDK installer"
-            & ".\$7zDirectory\$7zExecutable"                      `
-                'e' $OracleJDKInstaller                           `
-                "$OracleJDKInternalCABPath\$OracleJDKInternalCAB" `
-                '-y'
-        }
-
-        #
-        # Unpack the Oracle JDK Tools CAB with 7-Zip.
-        #
-
-        Write-Output "Unpack JDK archive"
-        & ".\$7zDirectory\$7zExecutable"     `
-            'e' $OracleJDKInternalCAB        `
-            "$OracleJDKInternalArchive" '-y'
-    }
-
-    Write-Output "Unpack JDK"
-    & ".\$7zDirectory\$7zExecutable" 'x' $OracleJDKInternalArchive `
-                                     "-o$OracleJDKDirectory" '-y'
-}
-
-#
-# Unpack Oracle JDK `.pack` files with the unpack200
-# utility bundled with the JDK.
-#
-
-Write-Output "Expand JDK files"
-$GetChildItemParameters = @{
-    Path = $OracleJDKDirectory;
-    Filter = '*.pack';
-}
-$PackFiles =
-    Get-ChildItem @GetChildItemParameters -Recurse
-
-if ($PackFiles)
-{
-    foreach ($File in $PackFiles)
-    {
-        $PackFileName =
-            $File.FullName
-        $JarFileName =
-            "$($File.DirectoryName)\$($File.BaseName).jar"
-
-        & "$OracleJDKBinariesDirectory\unpack200" '-r' `
-            $PackFileName $JarFileName
-    }
-}
-
 #
 # Create a new SDK directory.
 #
@@ -237,9 +161,7 @@ SET USERPROFILE=%~dp0$PortableHomeDirectory
 SET ANDROID_HOME=%~dp0$AndroidSDKDirectory
 SET ANDROID_SDK_HOME=%~dp0$PortableHomeDirectory
 SET GRADLE_USER_HOME=%~dp0$GradleUserHomeDirectory
-SET JAVA_HOME=%~dp0$OracleJDKDirectory
 
-SET PATH=%~dp0$OracleJDKBinariesDirectory;%PATH%
 SET PATH=%~dp0$AndroidStudioBinariesDirectory;%PATH%
 SET PATH=$AndroidSDKBinariesPaths%PATH%
 

Start-AndroidStudioPortable.ps1

@@ -32,11 +32,7 @@ $env:ANDROID_SDK_HOME =
     Expand-Path -Path $PortableHomeDirectory
 $env:GRADLE_USER_HOME =
     Expand-Path -Path $GradleUserHomeDirectory
-$env:JAVA_HOME =
-    Expand-Path -Path $OracleJDKDirectory
 
-$env:PATH =
-    "$(Expand-Path -Path $OracleJDKBinariesDirectory);$env:PATH"
 $env:PATH =
     "$(Expand-Path -Path $AndroidStudioBinariesDirectory);$env:PATH"