diff options
| author | 2024-09-26 18:18:37 +0000 | |
|---|---|---|
| committer | 2024-09-26 18:18:37 +0000 | |
| commit | ba6b33b58e0ffe59b00920fcd08402e773facda6 (patch) | |
| tree | a407f7ecd26f407668424cf49312a7d5994cb1c7 /java/sdk_library.go | |
| parent | d5f6f594decbca469ef6d3e30f7d35d6a42aa64a (diff) | |
| parent | ff49c6c75d8c2978b4cd7b8a8921de8f2ac4f6a3 (diff) | |
Merge "Use providers for lint" into main am: ff49c6c75d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3283077
Change-Id: Id311119272fdf4c577a3e8ffa05f6f3c756a1f34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'java/sdk_library.go')
| -rw-r--r-- | java/sdk_library.go | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/java/sdk_library.go b/java/sdk_library.go index c2b1c4f31..f9388ba2a 100644 --- a/java/sdk_library.go +++ b/java/sdk_library.go @@ -1515,7 +1515,10 @@ func (module *SdkLibrary) GenerateAndroidBuildActions(ctx android.ModuleContext) module.dexer.proguardDictionary = module.implLibraryModule.dexer.proguardDictionary module.dexer.proguardUsageZip = module.implLibraryModule.dexer.proguardUsageZip module.linter.reports = module.implLibraryModule.linter.reports - module.linter.outputs.depSets = module.implLibraryModule.LintDepSets() + + if lintInfo, ok := android.OtherModuleProvider(ctx, module.implLibraryModule, LintProvider); ok { + android.SetProvider(ctx, LintProvider, lintInfo) + } if !module.Host() { module.hostdexInstallFile = module.implLibraryModule.hostdexInstallFile @@ -2254,14 +2257,6 @@ func (module *SdkLibraryImport) JacocoReportClassesFile() android.Path { } // to satisfy apex.javaDependency interface -func (module *SdkLibraryImport) LintDepSets() LintDepSets { - if module.implLibraryModule == nil { - return LintDepSets{} - } else { - return module.implLibraryModule.LintDepSets() - } -} - func (module *SdkLibraryImport) GetStrictUpdatabilityLinting() bool { if module.implLibraryModule == nil { return false |