diff options
| author | 2024-10-15 20:45:35 +0000 | |
|---|---|---|
| committer | 2024-10-29 19:21:44 +0000 | |
| commit | e70976d4d537dc69cb9f53557251065f3beb1a72 (patch) | |
| tree | f9147acc403b809227567938549ab0c4fa4dd22d /filesystem/vbmeta.go | |
| parent | cc723c5a2727e5c111d0f4cad7bd9e042371b066 (diff) | |
Revert^2 "Convert cc modules to use AndroidMkInfoProvider."
This reverts commit 37e6794ad44926e64c1f733dbe32bbf5a40efe77.
Reason for revert: reland with fix to the test
Bug: 358427516
Test: Unit tests and manually compare generated mk files.
Change-Id: Iddc34471f15cfe0c8ed863d05a1344e295925565
Diffstat (limited to 'filesystem/vbmeta.go')
| -rw-r--r-- | filesystem/vbmeta.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/filesystem/vbmeta.go b/filesystem/vbmeta.go index 51ba7c984..0bae479cf 100644 --- a/filesystem/vbmeta.go +++ b/filesystem/vbmeta.go @@ -213,7 +213,6 @@ func (v *vbmeta) GenerateAndroidBuildActions(ctx android.ModuleContext) { ctx.InstallFile(v.installDir, v.installFileName(), v.output) ctx.SetOutputFiles([]android.Path{v.output}, "") - android.SetProvider(ctx, android.AndroidMkInfoProvider, v.prepareAndroidMKProviderInfo()) } // Returns the embedded shell command that prints the rollback index @@ -266,7 +265,9 @@ func (v *vbmeta) extractPublicKeys(ctx android.ModuleContext) map[string]android return result } -func (v *vbmeta) prepareAndroidMKProviderInfo() *android.AndroidMkProviderInfo { +var _ android.AndroidMkProviderInfoProducer = (*vbmeta)(nil) + +func (v *vbmeta) PrepareAndroidMKProviderInfo(config android.Config) *android.AndroidMkProviderInfo { providerData := android.AndroidMkProviderInfo{ PrimaryInfo: android.AndroidMkInfo{ Class: "ETC", |