commit cfb655142fbe9bc89a6961b9887d552305abab2a
author Rico Wind <ricow@google.com> Wed Feb 27 12:57:34 2019 +0100
committer Rico Wind <ricow@google.com> Wed Feb 27 12:57:34 2019 +0100
tree c9b236104c205e1c7bc2b7185635de359286bf62
parent 63a145963903e100b91c05440b17f766ac97f1f5

Use correct java for invoking R8 in build.gradle

Bug: 126504777
Change-Id: I3c45258dc774914ed07931cf8301467d2be17699

build.gradle

diff --git a/build.gradle b/build.gradle
index 5f33458..6afc31a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -704,7 +704,8 @@
 
 def baseR8CommandLine(args = []) {
     // Execute r8 commands against a stable r8 with relocated dependencies.
-    return ["java", "-ea", "-jar", r8WithRelocatedDeps.outputs.files[0]] + args
+    return [org.gradle.internal.jvm.Jvm.current().getJavaExecutable(),
+            "-ea", "-jar", r8WithRelocatedDeps.outputs.files[0]] + args
 }
 
 def r8CfCommandLine(input, output, pgconf, args = [], libs = []) {