From 2da9d9abca8e1a355f8b9fcbb3ae550bfb40a8b6 Mon Sep 17 00:00:00 2001 From: Yu Liu Date: Wed, 15 Jan 2025 00:27:02 +0000 Subject: Convert dex2oatPathFromDep to use ModuleProxy. Bug: 377723687 Test: Unit tests and compare the ninja and mk files generated. Change-Id: I99ffe88179991da8e5963605bf76666c8945d290 --- android/module.go | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'android/module.go') diff --git a/android/module.go b/android/module.go index c88d04556..b9489b482 100644 --- a/android/module.go +++ b/android/module.go @@ -1891,15 +1891,16 @@ var CommonModuleInfoKey = blueprint.NewProvider[CommonModuleInfo]() type PrebuiltModuleInfo struct { SourceExists bool + UsePrebuilt bool } var PrebuiltModuleInfoProvider = blueprint.NewProvider[PrebuiltModuleInfo]() -type HostToolProviderData struct { +type HostToolProviderInfo struct { HostToolPath OptionalPath } -var HostToolProviderKey = blueprint.NewProvider[HostToolProviderData]() +var HostToolProviderInfoProvider = blueprint.NewProvider[HostToolProviderInfo]() type SourceFileGenerator interface { GeneratedSourceFiles() Paths @@ -2212,10 +2213,11 @@ func (m *ModuleBase) GenerateBuildActions(blueprintCtx blueprint.ModuleContext) if p, ok := m.module.(PrebuiltInterface); ok && p.Prebuilt() != nil { SetProvider(ctx, PrebuiltModuleInfoProvider, PrebuiltModuleInfo{ SourceExists: p.Prebuilt().SourceExists(), + UsePrebuilt: p.Prebuilt().UsePrebuilt(), }) } if h, ok := m.module.(HostToolProvider); ok { - SetProvider(ctx, HostToolProviderKey, HostToolProviderData{ + SetProvider(ctx, HostToolProviderInfoProvider, HostToolProviderInfo{ HostToolPath: h.HostToolPath()}) } -- cgit v1.2.3-59-g8ed1b