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

cmd/gogio: group buildInfo related code

Browse Source 
Signed-off-by: Walter Werner SCHNEIDER <contact@schnwalter.eu>
This commit is contained in:
Walter Werner SCHNEIDER
2020-11-11 23:16:33 +02:00
committed by Elias Naur
parent 7eb32360e5
commit 3c739323cb
7 changed files with 197 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmd/gogio/androidbuild.go
+3 -3
View File
@@ -111,7 +111,7 @@ func buildAndroid(tmpDir string, bi *buildInfo) error {
"CGO_ENABLED=1",
),
}
pkgs, err := packages.Load(cfg, bi.pkg)
pkgs, err := packages.Load(cfg, bi.pkgPath)
if err != nil {
return err
}
@@ -205,7 +205,7 @@ func compileAndroid(tmpDir string, tools *androidTools, bi *buildInfo) (err erro
"-buildmode=c-shared",
"-tags", bi.tags,
"-o", libFile,
bi.pkg,
bi.pkgPath,
)
cmd.Env = append(
os.Environ(),
@@ -352,7 +352,7 @@ func exeAndroid(tmpDir string, tools *androidTools, bi *buildInfo, extraJars, pe
}
icon := *iconPath
if icon == "" {
icon = filepath.Join(bi.dir, "appicon.png")
icon = filepath.Join(bi.pkgDir, "appicon.png")
}
iconSnip := ""
if _, err := os.Stat(icon); err == nil {