diff options
| author | 2024-07-18 15:36:32 -0700 | |
|---|---|---|
| committer | 2024-08-07 14:11:43 -0700 | |
| commit | 7727c7f0960886b4302d60256576b2daac56354f (patch) | |
| tree | f38f9f93ea915bbeeae38ba883512b5fc06c29d5 /java/system_modules.go | |
| parent | d40aac13401a7826c31f50598bd1703ef3c75e67 (diff) | |
Convert JavaInfoProvider to *JavaInfo
Convert JavaInfoProvider to return a *JavaInfo instead of a JavaInfo.
This will reduce copying when reading the provider, and also allows
JavaInfo to recursively contain a depset of JavaInfos from
dependencies.
Bug: 308016794
Test: go test ./java/...
Flag: EXEMPT refactor
Change-Id: Ibf6d9b797f760ad1fe815d59839839fdfad91733
Diffstat (limited to 'java/system_modules.go')
| -rw-r--r-- | java/system_modules.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/java/system_modules.go b/java/system_modules.go index 8e2d5d8ff..500d7fa25 100644 --- a/java/system_modules.go +++ b/java/system_modules.go @@ -162,8 +162,9 @@ func (system *SystemModules) GenerateAndroidBuildActions(ctx android.ModuleConte var jars android.Paths ctx.VisitDirectDepsWithTag(systemModulesLibsTag, func(module android.Module) { - dep, _ := android.OtherModuleProvider(ctx, module, JavaInfoProvider) - jars = append(jars, dep.HeaderJars...) + if dep, ok := android.OtherModuleProvider(ctx, module, JavaInfoProvider); ok { + jars = append(jars, dep.HeaderJars...) + } }) system.headerJars = jars |