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: ensure compatible gioui.org module version

Browse Source 
Fixes gio#286

Signed-off-by: Elias Naur <mail@eliasnaur.com>
This commit is contained in:
Elias Naur
2021-10-09 16:58:57 +02:00
parent 960f3068a1
commit a4242d04d1
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmd/gogio/androidbuild.go
+11 -6
View File
@@ -248,6 +248,9 @@ func compileAndroid(tmpDir string, tools *androidTools, bi *buildInfo) (err erro
if err != nil {
return err
}
if len(javaFiles) == 0 {
return fmt.Errorf("the gioui.org/app package contains no .java files (gioui.org module too old?)")
}
if len(javaFiles) > 0 {
classes := filepath.Join(tmpDir, "classes")
if err := os.MkdirAll(classes, 0755); err != nil {
@@ -559,12 +562,14 @@ func exeAndroid(tmpDir string, tools *androidTools, bi *buildInfo, extraJars, pe
}
// Append classes.dex.
classesFolder := "classes.dex"
if isBundle {
classesFolder = "dex/classes.dex"
}
if err := appendToZip(classesFolder, filepath.Join(dexDir, "classes.dex")); err != nil {
return err
if len(classFiles) > 0 {
classesFolder := "classes.dex"
if isBundle {
classesFolder = "dex/classes.dex"
}
if err := appendToZip(classesFolder, filepath.Join(dexDir, "classes.dex")); err != nil {
return err
}
}
return unsignedAPKZip.Close()