Use ctx.PackageManager.GetInstalledPlatformRelease instead of PlatformRelease.GetInstalled

Author: cmaglie

hardware_loader.go

@@ -38,11 +38,13 @@ import (
 type HardwareLoader struct{}
 
 func (s *HardwareLoader) Run(ctx *types.Context) error {
-	pm := packagemanager.NewPackageManager(nil, nil, nil, nil)
-	if err := pm.LoadHardwareFromDirectories(ctx.HardwareDirs); err != nil {
-		return i18n.WrapError(err)
+	if ctx.PackageManager == nil {
+		pm := packagemanager.NewPackageManager(nil, nil, nil, nil)
+		if err := pm.LoadHardwareFromDirectories(ctx.HardwareDirs); err != nil {
+			return i18n.WrapError(err)
+		}
+		ctx.PackageManager = pm
 	}
-	ctx.PackageManager = pm
-	ctx.Hardware = pm.GetPackages()
+	ctx.Hardware = ctx.PackageManager.GetPackages()
 	return nil
 }

setup_build_properties.go

@@ -87,15 +87,16 @@ func (s *SetupBuildProperties) Run(ctx *types.Context) error {
 	if variant == "" {
 		buildProperties["build.variant.path"] = ""
 	} else {
-		var variantPlatform *cores.PlatformRelease
+		var variantPlatformRelease *cores.PlatformRelease
 		variantParts := strings.Split(variant, ":")
 		if len(variantParts) > 1 {
-			variantPlatform = packages.Packages[variantParts[0]].Platforms[targetPlatform.Platform.Architecture].GetInstalled()
+			variantPlatform := packages.Packages[variantParts[0]].Platforms[targetPlatform.Platform.Architecture]
+			variantPlatformRelease = ctx.PackageManager.GetInstalledPlatformRelease(variantPlatform)
 			variant = variantParts[1]
 		} else {
-			variantPlatform = targetPlatform
+			variantPlatformRelease = targetPlatform
 		}
-		buildProperties["build.variant.path"] = variantPlatform.InstallDir.Join("variants", variant).String()
+		buildProperties["build.variant.path"] = variantPlatformRelease.InstallDir.Join("variants", variant).String()
 	}
 
 	for _, tool := range ctx.AllTools {