joejulian/gio
1
0
Fork 1
mirror of https://git.sr.ht/~eliasnaur/gio synced 2026-07-01 07:35:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

cmd/gogio: [Android] suggest only Java 1.8 when d8 fails

Browse Source 
We're compiling with -target and -source set to 1.8, so 1.7 is not
adequate.

Signed-off-by: Elias Naur <mail@eliasnaur.com>
This commit is contained in:
Elias Naur
2022-01-21 17:57:52 +01:00
parent 862fa832c9
commit cf54e39736
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmd/gogio/androidbuild.go
+2 -2
View File
@@ -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
}