commit 5888692bbfab7cf85775ee4c700be00321b3cd91
author Morten Krogh-Jespersen <mkroghj@google.com> Fri Mar 20 09:20:24 2020 +0100
committer Morten Krogh-Jespersen <mkroghj@google.com> Fri Mar 20 08:23:39 2020 +0000
tree 06459ab44e0e5d5ba826844a770f491aea1d5c69
parent 0c5f22b0c97ff8dd66194e5ab883dc001442a5fe

Add JAVA_HOME to environment to ensure always compiling with JDK 8

Change-Id: I132c0a9765dd2cc1a80def2d85672a0d5e3686ea

tools/jdk.py

diff --git a/tools/jdk.py b/tools/jdk.py
index 5791e50..bc40873 100755
--- a/tools/jdk.py
+++ b/tools/jdk.py
@@ -20,6 +20,15 @@
   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 a7ff35d..f003de2 100755
--- a/tools/run_on_as_app.py
+++ b/tools/run_on_as_app.py
@@ -708,6 +708,7 @@
       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...'