commit 8a42f7fcee668c55f7b89593076614befd178918
author Morten Krogh-Jespersen <mkroghj@google.com> Mon Mar 23 07:52:34 2020 +0000
committer Morten Krogh-Jespersen <mkroghj@google.com> Mon Mar 23 07:52:53 2020 +0000
tree 5bca0667739e903425ead90d3cc7b4c6b677e32d
parent e0302c213e9405dd5b76ff13313a514c5be970a9

Revert "Add JAVA_HOME to environment to ensure always compiling with JDK 8"

This reverts commit 5888692bbfab7cf85775ee4c700be00321b3cd91.

Reason for revert: Failing on the bots

Change-Id: I34a137221f324b41f1e397a26ccf66cd3d3cfc20

tools/jdk.py

diff --git a/tools/jdk.py b/tools/jdk.py
index bc40873..5791e50 100755
--- a/tools/jdk.py
+++ b/tools/jdk.py
@@ -20,15 +20,6 @@
   else:
     return os.environ['JAVA_HOME']
 
-def GetJdk8Home():
-  root = os.path.join(JDK_DIR, 'jdk8')
-  if defines.IsLinux():
-    return os.path.join(root, 'linux-x86')
-  elif defines.IsOsX():
-    return os.path.join(root, 'darwin-x86')
-  else:
-    return os.environ['JAVA_HOME']
-
 def GetJavaExecutable(jdkHome=None):
   jdkHome = jdkHome if jdkHome else GetJdkHome()
   executable = 'java.exe' if defines.IsWindows() else 'java'

tools/run_on_as_app.py

diff --git a/tools/run_on_as_app.py b/tools/run_on_as_app.py
index 95dbaf7..fbe4069 100755
--- a/tools/run_on_as_app.py
+++ b/tools/run_on_as_app.py
@@ -719,7 +719,6 @@
       app, checkout_dir, proguard_config_dest)
 
   env_vars = {}
-  env_vars['JAVA_HOME'] = jdk.GetJdkHome()
   env_vars['ANDROID_HOME'] = utils.getAndroidHome()
   if not options.disable_assertions:
     env_vars['JAVA_OPTS'] = '-ea:com.android.tools.r8...'