mirror of
https://git.sr.ht/~eliasnaur/gio
synced 2026-07-05 09:25:38 +00:00
cmd/gogio: [Android] update arguments to d8
According to the d8 documentation[0] `--lib` should be used to specify the path to android.jar, not `--classpath`. Also specify minimum SDK version to allow d8 to perform version-specific optimizations. May fix #349. References: https://todo.sr.ht/~eliasnaur/gio/349 Signed-off-by: Elias Naur <mail@eliasnaur.com>
This commit is contained in:
+12
-11
@@ -353,11 +353,22 @@ func exeAndroid(tmpDir string, tools *androidTools, bi *buildInfo, extraJars, pe
|
|||||||
if err := os.MkdirAll(dexDir, 0755); err != nil {
|
if err := os.MkdirAll(dexDir, 0755); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
// Currently, new apps must have a target SDK version of at least 30.
|
||||||
|
// https://developer.android.com/distribute/best-practices/develop/target-sdk
|
||||||
|
targetSDK := 30
|
||||||
|
if bi.minsdk > targetSDK {
|
||||||
|
targetSDK = bi.minsdk
|
||||||
|
}
|
||||||
|
minSDK := 16
|
||||||
|
if bi.minsdk > minSDK {
|
||||||
|
minSDK = bi.minsdk
|
||||||
|
}
|
||||||
if len(classFiles) > 0 {
|
if len(classFiles) > 0 {
|
||||||
d8 := exec.Command(
|
d8 := exec.Command(
|
||||||
filepath.Join(tools.buildtools, "d8"),
|
filepath.Join(tools.buildtools, "d8"),
|
||||||
"--classpath", tools.androidjar,
|
"--lib", tools.androidjar,
|
||||||
"--output", dexDir,
|
"--output", dexDir,
|
||||||
|
"--min-api", strconv.Itoa(minSDK),
|
||||||
)
|
)
|
||||||
d8.Args = append(d8.Args, classFiles...)
|
d8.Args = append(d8.Args, classFiles...)
|
||||||
if _, err := runCmd(d8); err != nil {
|
if _, err := runCmd(d8); err != nil {
|
||||||
@@ -425,16 +436,6 @@ func exeAndroid(tmpDir string, tools *androidTools, bi *buildInfo, extraJars, pe
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Link APK.
|
// Link APK.
|
||||||
// Currently, new apps must have a target SDK version of at least 30.
|
|
||||||
// https://developer.android.com/distribute/best-practices/develop/target-sdk
|
|
||||||
targetSDK := 30
|
|
||||||
if bi.minsdk > targetSDK {
|
|
||||||
targetSDK = bi.minsdk
|
|
||||||
}
|
|
||||||
minSDK := 16
|
|
||||||
if bi.minsdk > minSDK {
|
|
||||||
minSDK = bi.minsdk
|
|
||||||
}
|
|
||||||
permissions, features := getPermissions(perms)
|
permissions, features := getPermissions(perms)
|
||||||
appName := strings.Title(bi.name)
|
appName := strings.Title(bi.name)
|
||||||
manifestSrc := manifestData{
|
manifestSrc := manifestData{
|
||||||
|
|||||||
Reference in New Issue
Block a user