summaryrefslogtreecommitdiff
path: root/apex/apex.go
diff options
context:
space:
mode:
author Colin Cross <ccross@android.com> 2023-11-15 11:38:36 -0800
committer Colin Cross <ccross@android.com> 2023-11-15 11:40:48 -0800
commita644c263dd1ea327f428e540a4f0aea82e7a42bd (patch)
tree91637f40fc473be5daf80bcac466d1a5676abc3f /apex/apex.go
parent692f54baeb8494e72faac06bb5cf0348d6862216 (diff)
Stop collecting path entry for module_bp_java_deps.json from each module type
The jdepsGeneratorSingleton can get the module path directly, it doesn't need to be collected by each module type that implements IDEInfo. Fixes module types (like android_library) that didn't reach the code that collected the path. Bug: 309835196 Test: out/soong/module_bp_java_deps.json contains path for ExtServices.core Change-Id: If8cb81b4f708e0367f156ade164bee253bf53492
Diffstat (limited to 'apex/apex.go')
-rw-r--r--apex/apex.go6
1 files changed, 0 insertions, 6 deletions
diff --git a/apex/apex.go b/apex/apex.go
index f2e8a0623..834e57967 100644
--- a/apex/apex.go
+++ b/apex/apex.go
@@ -482,9 +482,6 @@ type apexBundle struct {
nativeApisUsedByModuleFile android.ModuleOutPath
nativeApisBackedByModuleFile android.ModuleOutPath
javaApisUsedByModuleFile android.ModuleOutPath
-
- // Collect the module directory for IDE info in java/jdeps.go.
- modulePaths []string
}
// apexFileClass represents a type of file that can be included in APEX.
@@ -2406,8 +2403,6 @@ func (a *apexBundle) GenerateAndroidBuildActions(ctx android.ModuleContext) {
}
////////////////////////////////////////////////////////////////////////////////////////////
// 2) traverse the dependency tree to collect apexFile structs from them.
- // Collect the module directory for IDE info in java/jdeps.go.
- a.modulePaths = append(a.modulePaths, ctx.ModuleDir())
// TODO(jiyong): do this using WalkPayloadDeps
// TODO(jiyong): make this clean!!!
@@ -2972,7 +2967,6 @@ func (a *apexBundle) IDEInfo(dpInfo *android.IdeInfo) {
dpInfo.Deps = append(dpInfo.Deps, a.properties.Java_libs...)
dpInfo.Deps = append(dpInfo.Deps, a.properties.Bootclasspath_fragments...)
dpInfo.Deps = append(dpInfo.Deps, a.properties.Systemserverclasspath_fragments...)
- dpInfo.Paths = append(dpInfo.Paths, a.modulePaths...)
}
var (