summaryrefslogtreecommitdiff
path: root/genrule
diff options
context:
space:
mode:
author Yu Liu <yudiliu@google.com> 2025-03-13 18:36:35 +0000
committer Yu Liu <yudiliu@google.com> 2025-03-13 18:36:35 +0000
commitf22120fb1da7f75a571966124bb0da6a57fd4f07 (patch)
tree9ffabf8102382f54c89595a59e3211eccd766217 /genrule
parent7c18e7f15b997e0e3199111446e0511ffd96b811 (diff)
Change CommonModuleInfoProvider to a pointer.
Bug: 358427516 Test: Manually verified genereated ninja and mk files, unit tests. Change-Id: I53a6dd718232735decbeb93febfd269dd9449e86
Diffstat (limited to 'genrule')
-rw-r--r--genrule/genrule.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/genrule/genrule.go b/genrule/genrule.go
index e976e6b0e..710ec9555 100644
--- a/genrule/genrule.go
+++ b/genrule/genrule.go
@@ -112,7 +112,7 @@ func (t hostToolDependencyTag) AllowDisabledModuleDependency(target android.Modu
func (t hostToolDependencyTag) AllowDisabledModuleDependencyProxy(
ctx android.OtherModuleProviderContext, target android.ModuleProxy) bool {
- return android.OtherModuleProviderOrDefault(
+ return android.OtherModulePointerProviderOrDefault(
ctx, target, android.CommonModuleInfoProvider).ReplacedByPrebuilt
}
@@ -353,7 +353,7 @@ func (g *Module) generateCommonBuildActions(ctx android.ModuleContext) {
if h, ok := android.OtherModuleProvider(ctx, module, android.HostToolProviderInfoProvider); ok {
// A HostToolProvider provides the path to a tool, which will be copied
// into the sandbox.
- if !android.OtherModuleProviderOrDefault(ctx, module, android.CommonModuleInfoProvider).Enabled {
+ if !android.OtherModulePointerProviderOrDefault(ctx, module, android.CommonModuleInfoProvider).Enabled {
if ctx.Config().AllowMissingDependencies() {
ctx.AddMissingDependencies([]string{tool})
} else {