StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Stop collecting path entry for module_bp_java_deps.json from each module type" into main

Browse Source
This commit is contained in:
Colin Cross
2023-11-15 21:01:38 +00:00
committed by Gerrit Code Review
parent 9cb8fcbe06 a644c263dd
commit d7812415c3
7 changed files with 1 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
java/bootclasspath_fragment.go
View File

@@ -239,9 +239,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
}
@@ -472,9 +469,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) {
@@ -803,7 +797,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 {