From a644c263dd1ea327f428e540a4f0aea82e7a42bd Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Wed, 15 Nov 2023 11:38:36 -0800 Subject: 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 --- java/bootclasspath_fragment.go | 7 ------- 1 file changed, 7 deletions(-) (limited to 'java/bootclasspath_fragment.go') diff --git a/java/bootclasspath_fragment.go b/java/bootclasspath_fragment.go index 7d8a9f7bb..cd9d6d274 100644 --- a/java/bootclasspath_fragment.go +++ b/java/bootclasspath_fragment.go @@ -238,9 +238,6 @@ type BootclasspathFragmentModule struct { sourceOnlyProperties SourceOnlyBootclasspathProperties - // Collect the module directory for IDE info in java/jdeps.go. - modulePaths []string - // Path to the boot image profile. profilePath android.WritablePath } @@ -471,9 +468,6 @@ func (b *BootclasspathFragmentModule) GenerateAndroidBuildActions(ctx android.Mo // Generate classpaths.proto config b.generateClasspathProtoBuildActions(ctx) - // Collect the module directory for IDE info in java/jdeps.go. - b.modulePaths = append(b.modulePaths, ctx.ModuleDir()) - // Gather the bootclasspath fragment's contents. var contents []android.Module ctx.VisitDirectDeps(func(module android.Module) { @@ -801,7 +795,6 @@ func (b *BootclasspathFragmentModule) getProfilePath() android.Path { // Collect information for opening IDE project files in java/jdeps.go. func (b *BootclasspathFragmentModule) IDEInfo(dpInfo *android.IdeInfo) { dpInfo.Deps = append(dpInfo.Deps, b.properties.Contents...) - dpInfo.Paths = append(dpInfo.Paths, b.modulePaths...) } type bootclasspathFragmentMemberType struct { -- cgit v1.2.3-59-g8ed1b