Use ReplacedByPrebuilt from PrebuiltInfoProvider RepalcedByPrebuilt is being moved from CommonModuleInfoProvider to PrebuiltInfoProvider. Test: builds Change-Id: Ic2ea2e822fb77068ca75a3d7c267f61425550b87
diff --git a/wayland_protocol_codegen.go b/wayland_protocol_codegen.go index 43f99cf..2294c53 100644 --- a/wayland_protocol_codegen.go +++ b/wayland_protocol_codegen.go
@@ -127,8 +127,8 @@ func (t hostToolDependencyTag) AllowDisabledModuleDependencyProxy( ctx android.OtherModuleProviderContext, target android.ModuleProxy) bool { - return android.OtherModulePointerProviderOrDefault( - ctx, target, android.CommonModuleInfoProvider).ReplacedByPrebuilt + return android.OtherModuleProviderOrDefault( + ctx, target, android.PrebuiltInfoProvider).ReplacedByPrebuilt } var _ android.AllowDisabledModuleDependency = (*hostToolDependencyTag)(nil) @@ -633,15 +633,21 @@ type noopImageInterface struct{} -func (x noopImageInterface) ImageMutatorBegin(android.ImageInterfaceContext) {} -func (x noopImageInterface) VendorVariantNeeded(android.ImageInterfaceContext) bool { return false } -func (x noopImageInterface) ProductVariantNeeded(android.ImageInterfaceContext) bool { return false } -func (x noopImageInterface) CoreVariantNeeded(android.ImageInterfaceContext) bool { return false } -func (x noopImageInterface) RamdiskVariantNeeded(android.ImageInterfaceContext) bool { return false } -func (x noopImageInterface) VendorRamdiskVariantNeeded(android.ImageInterfaceContext) bool { return false } -func (x noopImageInterface) DebugRamdiskVariantNeeded(android.ImageInterfaceContext) bool { return false } -func (x noopImageInterface) RecoveryVariantNeeded(android.ImageInterfaceContext) bool { return false } -func (x noopImageInterface) ExtraImageVariations(ctx android.ImageInterfaceContext) []string { return nil } +func (x noopImageInterface) ImageMutatorBegin(android.ImageInterfaceContext) {} +func (x noopImageInterface) VendorVariantNeeded(android.ImageInterfaceContext) bool { return false } +func (x noopImageInterface) ProductVariantNeeded(android.ImageInterfaceContext) bool { return false } +func (x noopImageInterface) CoreVariantNeeded(android.ImageInterfaceContext) bool { return false } +func (x noopImageInterface) RamdiskVariantNeeded(android.ImageInterfaceContext) bool { return false } +func (x noopImageInterface) VendorRamdiskVariantNeeded(android.ImageInterfaceContext) bool { + return false +} +func (x noopImageInterface) DebugRamdiskVariantNeeded(android.ImageInterfaceContext) bool { + return false +} +func (x noopImageInterface) RecoveryVariantNeeded(android.ImageInterfaceContext) bool { return false } +func (x noopImageInterface) ExtraImageVariations(ctx android.ImageInterfaceContext) []string { + return nil +} func (x noopImageInterface) SetImageVariation(ctx android.ImageInterfaceContext, variation string) { }