|
@@ -6,7 +6,7 @@ import (
|
|
|
"sort"
|
|
|
|
|
|
"notabug.org/Umnik/GoAndroidSDK/sdk/platforms"
|
|
|
- system_images "notabug.org/Umnik/GoAndroidSDK/sdk/systemImages"
|
|
|
+ "notabug.org/Umnik/GoAndroidSDK/sdk/systemImages"
|
|
|
)
|
|
|
|
|
|
//RootDir returns path to SDK dir
|
|
@@ -30,7 +30,9 @@ func (s SDK) BuildTools() string {
|
|
|
//LastBuildToolsVersion returns path to last available version in "build-tools" dir
|
|
|
func (s SDK) LastBuildToolsVersion() string {
|
|
|
dirEntries, err := os.ReadDir(s.BuildTools())
|
|
|
- log.Fatal(err)
|
|
|
+ if err != nil {
|
|
|
+ panic(err)
|
|
|
+ }
|
|
|
versions := make([]string, len(dirEntries))
|
|
|
|
|
|
for i := range dirEntries {
|
|
@@ -64,8 +66,8 @@ func (s SDK) SystemImages() string {
|
|
|
return path.Join(s.RootDir(), "systemImages")
|
|
|
}
|
|
|
|
|
|
-//SpecificSystemImage returns path to specific system image catalog
|
|
|
+//SpecificSystemImageType returns path to specific system image catalog
|
|
|
//goland:noinspection GoUnnecessarilyExportedIdentifiers
|
|
|
-func (s SDK) SpecificSystemImage(image system_images.SystemImage) string {
|
|
|
- return path.Join(s.SystemImages(), image)
|
|
|
+func (s SDK) SpecificSystemImageType(image systemImages.SystemImage, imageType systemImages.SystemImageType) string {
|
|
|
+ return path.Join(s.SystemImages(), image, imageType)
|
|
|
}
|