diff options
Diffstat (limited to 'java')
| -rw-r--r-- | java/classpath_fragment.go | 5 | ||||
| -rw-r--r-- | java/droiddoc.go | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/java/classpath_fragment.go b/java/classpath_fragment.go index 18a5dae6c..fdccd3a84 100644 --- a/java/classpath_fragment.go +++ b/java/classpath_fragment.go @@ -18,9 +18,10 @@ package java import ( "fmt" + "strings" + "github.com/google/blueprint" "github.com/google/blueprint/proptools" - "strings" "android/soong/android" ) @@ -103,7 +104,7 @@ type classpathJar struct { func gatherPossibleApexModuleNamesAndStems(ctx android.ModuleContext, contents []string, tag blueprint.DependencyTag) []string { set := map[string]struct{}{} for _, name := range contents { - dep, _ := ctx.GetDirectDepWithTag(name, tag).(android.Module) + dep := ctx.GetDirectDepWithTag(name, tag) set[ModuleStemForDeapexing(dep)] = struct{}{} if m, ok := dep.(ModuleWithStem); ok { set[m.Stem()] = struct{}{} diff --git a/java/droiddoc.go b/java/droiddoc.go index 2980d91de..82713920d 100644 --- a/java/droiddoc.go +++ b/java/droiddoc.go @@ -427,9 +427,9 @@ func (j *Javadoc) collectDeps(ctx android.ModuleContext) deps { // Find the corresponding aconfig_declarations module name for such case. for _, src := range j.properties.Srcs { if moduleName, tag := android.SrcIsModuleWithTag(src); moduleName != "" { - otherModule := android.GetModuleFromPathDep(ctx, moduleName, tag) + otherModule := android.GetModuleProxyFromPathDep(ctx, moduleName, tag) if otherModule != nil { - if dep, ok := android.OtherModuleProvider(ctx, otherModule, android.CodegenInfoProvider); ok { + if dep, ok := android.OtherModuleProvider(ctx, *otherModule, android.CodegenInfoProvider); ok { deps.aconfigProtoFiles = append(deps.aconfigProtoFiles, dep.IntermediateCacheOutputPaths...) } } |