Convert CollectAllSharedDependencies to use ModuleProxy.
Bug: 377723687
Test: Unit tests and compare the ninja and mk files generated.
Change-Id: Ie3b6d1f8fa684ab191123bd57645b86f3bfa97b4
diff --git a/android/module.go b/android/module.go
index 287ac59..8faaa9f 100644
--- a/android/module.go
+++ b/android/module.go
@@ -1887,11 +1887,11 @@
var CommonModuleInfoKey = blueprint.NewProvider[CommonModuleInfo]()
-type PrebuiltModuleProviderData struct {
- // Empty for now
+type PrebuiltModuleInfo struct {
+ SourceExists bool
}
-var PrebuiltModuleProviderKey = blueprint.NewProvider[PrebuiltModuleProviderData]()
+var PrebuiltModuleInfoProvider = blueprint.NewProvider[PrebuiltModuleInfo]()
type HostToolProviderData struct {
HostToolPath OptionalPath
@@ -2193,7 +2193,9 @@
}
SetProvider(ctx, CommonModuleInfoKey, commonData)
if p, ok := m.module.(PrebuiltInterface); ok && p.Prebuilt() != nil {
- SetProvider(ctx, PrebuiltModuleProviderKey, PrebuiltModuleProviderData{})
+ SetProvider(ctx, PrebuiltModuleInfoProvider, PrebuiltModuleInfo{
+ SourceExists: p.Prebuilt().SourceExists(),
+ })
}
if h, ok := m.module.(HostToolProvider); ok {
SetProvider(ctx, HostToolProviderKey, HostToolProviderData{
diff --git a/android/prebuilt.go b/android/prebuilt.go
index 0ac67b3..bf27178 100644
--- a/android/prebuilt.go
+++ b/android/prebuilt.go
@@ -384,7 +384,7 @@
if !OtherModuleProviderOrDefault(ctx, module, CommonModuleInfoKey).ReplacedByPrebuilt {
return module
}
- if _, ok := OtherModuleProvider(ctx, module, PrebuiltModuleProviderKey); ok {
+ if _, ok := OtherModuleProvider(ctx, module, PrebuiltModuleInfoProvider); ok {
// If we're given a prebuilt then assume there's no source module around.
return module
}