commit a5204f383137a7928fd5a96a4bf760a7de69b7af
author Jake Wharton <jakew@google.com> Wed Jun 26 08:29:21 2019 -0400
committer Jake Wharton <jakew@google.com> Wed Jun 26 12:46:23 2019 +0000
tree 86965f7816493003641f3c2efa613e34f4bfca37
parent 897f6cc3230ec932069185165eecb9049624e631

Correct JDK 11 paths for Mac OS

Bug: 136021553
Change-Id: I60494db6c18ad37257d3f429b4659ef36687cf27

build.gradle

diff --git a/build.gradle b/build.gradle
index 9bd2e90..ad28ff9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -532,7 +532,7 @@
     if (OperatingSystem.current().isLinux()) {
         options.forkOptions.javaHome = file(jdkDir + 'Linux')
     } else if (OperatingSystem.current().isMacOsX()) {
-        options.forkOptions.javaHome = file(jdkDir + 'Mac')
+        options.forkOptions.javaHome = file(jdkDir + 'Mac/Contents/Home')
     } else {
         options.forkOptions.javaHome = file(jdkDir + 'Windows')
     }
@@ -547,7 +547,7 @@
     if (OperatingSystem.current().isLinux()) {
         options.forkOptions.javaHome = file(jdkDir + 'Linux')
     } else if (OperatingSystem.current().isMacOsX()) {
-        options.forkOptions.javaHome = file(jdkDir + 'Mac')
+        options.forkOptions.javaHome = file(jdkDir + 'Mac/Contents/Home')
     } else {
         options.forkOptions.javaHome = file(jdkDir + 'Windows')
     }