commit 699f6360b1a75d020d907430aae10b941fbcd9a8
author Søren Gjesse <sgjesse@google.com> Wed Oct 09 14:56:33 2019 +0200
committer Søren Gjesse <sgjesse@google.com> Wed Oct 09 14:56:33 2019 +0200
tree 1ef6adebfa45121e934c24b3ff81c7db5f91092c
parent 4ac305c65cf97f00b821151401bccb9ee8086712

Download JDK8 for build of desugared library

Bug: 142352161
Change-Id: I44a85a09105f8deadb3cc34cea922639223bdb85

tools/archive_desugar_jdk_libs.py

diff --git a/tools/archive_desugar_jdk_libs.py b/tools/archive_desugar_jdk_libs.py
index 1254c0c..903f3b8 100755
--- a/tools/archive_desugar_jdk_libs.py
+++ b/tools/archive_desugar_jdk_libs.py
@@ -120,6 +120,7 @@
 
   # Make sure bazel is extracted in third_party.
   utils.DownloadFromGoogleCloudStorage(utils.BAZEL_SHA_FILE)
+  utils.DownloadFromGoogleCloudStorage(utils.JAVA8_SHA_FILE)
 
   # Only handling versioned desugar_jdk_libs.
   is_master = False

tools/utils.py

diff --git a/tools/utils.py b/tools/utils.py
index e848d23..fb937e6 100644
--- a/tools/utils.py
+++ b/tools/utils.py
@@ -94,6 +94,7 @@
 OPENSOURCE_APPS_FOLDER = os.path.join(THIRD_PARTY, 'opensource_apps')
 BAZEL_SHA_FILE = os.path.join(THIRD_PARTY, 'bazel.tar.gz.sha1')
 BAZEL_TOOL = os.path.join(THIRD_PARTY, 'bazel')
+JAVA8_SHA_FILE = os.path.join(THIRD_PARTY, 'openjdk', 'jdk8', 'linux-x86.tar.gz.sha1')
 
 ANDROID_HOME_ENVIROMENT_NAME = "ANDROID_HOME"
 ANDROID_TOOLS_VERSION_ENVIRONMENT_NAME = "ANDROID_TOOLS_VERSION"