chore: use host tool provider

Android's modules after ModuleBase.GenerateBuildActions
is finished should use module's providers instead of
direct access, cause CleanupAfterBuildActions() is called
who frees memory attached to the module.

Try to obtain host_bin path trough module providers
rather than by direct access of its properties.

Changes are done with soong compat layers as there
are differences in Soong's versions.

Change-Id: If726c22be164ee604ee341fd02b3a8092ed2a35b
Signed-off-by: Sebastian Birunt <sebastian.birunt@arm.com>

Author: birunts

core/androidbp_backend.go

@@ -310,6 +310,11 @@ func getSoongCompatFile(config *BobConfig) string {
 		text:     "a.SetPath(\"LOCAL_SOONG_INSTALLED_MODULE\", base.katiInstalls[len(base.katiInstalls)-1].to)\n",
 	}
 
+	androidHostToolProviderInfoProviderMatcher := codeMatcher{
+		filename: "build/soong/android/module.go",
+		text:     "\nvar HostToolProviderInfoProvider = blueprint.NewProvider[HostToolProviderInfo]()\n",
+	}
+
 	// List of compatibility layers, ordered from oldest Soong version
 	// support to newest.
 	allSoongCompats := []compatVersion{
@@ -337,9 +342,20 @@ func getSoongCompatFile(config *BobConfig) string {
 				androidMkExtraEntriesContextMatcher,
 				androidMkSoongInstallTargetsMatcher,
 			},
-			[]int{13},
+			[]int{13, 14, 15},
 			"soong_compat_02_AndroidMkSoongInstallTargets.go",
 		},
+		// Soong HostToolProviderInfoProvider
+		{
+			[]codeMatcher{
+				listOfAndroidMkEntriesMatcher,
+				androidMkExtraEntriesContextMatcher,
+				androidMkSoongInstallTargetsMatcher,
+				androidHostToolProviderInfoProviderMatcher,
+			},
+			[]int{16},
+			"soong_compat_03_HostBinProvider.go",
+		},
 	}
 
 	android_platform_version := config.Properties.GetInt("android_platform_version")

internal/soong_compat/soong_compat_00_pqr.go

@@ -5,6 +5,8 @@ package soong_compat
 
 import (
 	"android/soong/android"
+	"fmt"
+	"github.com/google/blueprint"
 )
 
 // This definition is compatible with Soong SHAs _before_ `aa2555387 Add ctx to
@@ -21,3 +23,16 @@ func ConvertAndroidMkExtraEntriesFunc(f AndroidMkExtraEntriesFunc) []android.And
 func SoongSupportsMkInstallTargets() bool {
 	return false
 }
+
+// This definition is compatible with Soong SHAs _before_
+// `dd9ccb4234dfc88a004e36b2c0500769a5f50ad3
+// Add ModuleProxy that should be used when visiting deps.`
+func GetHostBinPath(ctx android.ModuleContext, m blueprint.Module, host_bin string) android.OptionalPath {
+	htp, ok := m.(android.HostToolProvider)
+
+	if !ok {
+		panic(fmt.Errorf("%s is not a host tool", host_bin))
+	}
+
+	return htp.HostToolPath()
+}

internal/soong_compat/soong_compat_01_AndroidMkExtraEntries_ctx.go

@@ -5,6 +5,8 @@ package soong_compat
 
 import (
 	"android/soong/android"
+	"fmt"
+	"github.com/google/blueprint"
 )
 
 // This definition is compatible with Soong SHAs after `aa2555387 Add ctx to
@@ -20,3 +22,16 @@ func ConvertAndroidMkExtraEntriesFunc(f AndroidMkExtraEntriesFunc) []android.And
 func SoongSupportsMkInstallTargets() bool {
 	return false
 }
+
+// This definition is compatible with Soong SHAs _before_
+// `dd9ccb4234dfc88a004e36b2c0500769a5f50ad3
+// Add ModuleProxy that should be used when visiting deps.`
+func GetHostBinPath(ctx android.ModuleContext, m blueprint.Module, host_bin string) android.OptionalPath {
+	htp, ok := m.(android.HostToolProvider)
+
+	if !ok {
+		panic(fmt.Errorf("%s is not a host tool", host_bin))
+	}
+
+	return htp.HostToolPath()
+}

internal/soong_compat/soong_compat_02_AndroidMkSoongInstallTargets.go

@@ -5,6 +5,8 @@ package soong_compat
 
 import (
 	"android/soong/android"
+	"fmt"
+	"github.com/google/blueprint"
 )
 
 // This definition is compatible with Soong SHAs after `aa2555387 Add ctx to
@@ -20,3 +22,16 @@ func ConvertAndroidMkExtraEntriesFunc(f AndroidMkExtraEntriesFunc) []android.And
 func SoongSupportsMkInstallTargets() bool {
 	return true
 }
+
+// This definition is compatible with Soong SHAs _before_
+// `dd9ccb4234dfc88a004e36b2c0500769a5f50ad3
+// Add ModuleProxy that should be used when visiting deps.`
+func GetHostBinPath(ctx android.ModuleContext, m blueprint.Module, host_bin string) android.OptionalPath {
+	htp, ok := m.(android.HostToolProvider)
+
+	if !ok {
+		panic(fmt.Errorf("%s is not a host tool", host_bin))
+	}
+
+	return htp.HostToolPath()
+}

internal/soong_compat/soong_compat_03_HostBinProvider.go

@@ -0,0 +1,37 @@
+//go:build soong
+// +build soong
+
+package soong_compat
+
+import (
+	"android/soong/android"
+	"fmt"
+	"github.com/google/blueprint"
+)
+
+// This definition is compatible with Soong SHAs after `aa2555387 Add ctx to
+// AndroidMkExtraEntriesFunc`
+func ConvertAndroidMkExtraEntriesFunc(f AndroidMkExtraEntriesFunc) []android.AndroidMkExtraEntriesFunc {
+	return []android.AndroidMkExtraEntriesFunc{
+		func(ctx android.AndroidMkExtraEntriesContext, entries *android.AndroidMkEntries) {
+			f(entries)
+		},
+	}
+}
+
+func SoongSupportsMkInstallTargets() bool {
+	return true
+}
+
+// This definition is compatible with Soong SHAs _after_
+// `dd9ccb4234dfc88a004e36b2c0500769a5f50ad3
+// Add ModuleProxy that should be used when visiting deps.`
+func GetHostBinPath(ctx android.ModuleContext, m blueprint.Module, host_bin string) android.OptionalPath {
+	htp, ok := android.OtherModuleProvider(ctx, m, android.HostToolProviderInfoProvider)
+
+	if !ok {
+		panic(fmt.Errorf("No HostToolProviderInfoProvider for %s module!", host_bin))
+	}
+
+	return htp.HostToolPath
+}

plugins/genrulebob/genrule.go

@@ -4,7 +4,6 @@
 package genrulebob
 
 import (
-	"fmt"
 	"path/filepath"
 	"regexp"
 	"strconv"
@@ -258,12 +257,10 @@ func (m *genrulebobCommon) getHostBin(ctx android.ModuleContext) android.Optiona
 	if m.Properties.Host_bin == "" {
 		return android.OptionalPath{}
 	}
+
 	hostBinModule := ctx.GetDirectDepWithTag(m.Properties.Host_bin, hostToolBinTag)
-	htp, ok := hostBinModule.(genrule.HostToolProvider)
-	if !ok {
-		panic(fmt.Errorf("%s is not a host tool", m.Properties.Host_bin))
-	}
-	return htp.HostToolPath()
+
+	return soong_compat.GetHostBinPath(ctx, hostBinModule, m.Properties.Host_bin)
 }
 
 // Previous Soong version does not contain yet `android.OutputFilesProvider` interface