From cf54e397365c4a1d7a2415335307e40e289adeca Mon Sep 17 00:00:00 2001 From: Elias Naur Date: Fri, 21 Jan 2022 17:57:52 +0100 Subject: [PATCH] cmd/gogio: [Android] suggest only Java 1.8 when d8 fails We're compiling with -target and -source set to 1.8, so 1.7 is not adequate. Signed-off-by: Elias Naur --- cmd/gogio/androidbuild.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmd/gogio/androidbuild.go b/cmd/gogio/androidbuild.go index 12148c30..e0f60ae0 100644 --- a/cmd/gogio/androidbuild.go +++ b/cmd/gogio/androidbuild.go @@ -362,8 +362,8 @@ func exeAndroid(tmpDir string, tools *androidTools, bi *buildInfo, extraJars, pe d8.Args = append(d8.Args, classFiles...) if _, err := runCmd(d8); err != nil { major, minor, ok := determineJDKVersion() - if ok && (major != 1 || minor < 7 || 8 < minor) { - return fmt.Errorf("unsupported JDK version %d.%d, expected 1.7 or 1.8\nd8 error: %v", major, minor, err) + if ok && (major != 1 || minor != 8) { + return fmt.Errorf("unsupported JDK version %d.%d, expected 1.8\nd8 error: %v", major, minor, err) } return err }