diff options
Diffstat (limited to 'java')
| -rw-r--r-- | java/bootclasspath_fragment.go | 12 | ||||
| -rw-r--r-- | java/systemserver_classpath_fragment.go | 12 |
2 files changed, 24 insertions, 0 deletions
diff --git a/java/bootclasspath_fragment.go b/java/bootclasspath_fragment.go index 792193f9f..7936c2bb4 100644 --- a/java/bootclasspath_fragment.go +++ b/java/bootclasspath_fragment.go @@ -132,6 +132,9 @@ type BootclasspathFragmentModule struct { ClasspathFragmentBase properties bootclasspathFragmentProperties + + // Collect the module directory for IDE info in java/jdeps.go. + modulePaths []string } // commonBootclasspathFragment defines the methods that are implemented by both source and prebuilt @@ -389,6 +392,9 @@ 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) { @@ -648,6 +654,12 @@ func (b *BootclasspathFragmentModule) generateBootImageBuildActions(ctx android. return true } +// 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 { android.SdkMemberTypeBase } diff --git a/java/systemserver_classpath_fragment.go b/java/systemserver_classpath_fragment.go index 7ffb05602..5bd25cd51 100644 --- a/java/systemserver_classpath_fragment.go +++ b/java/systemserver_classpath_fragment.go @@ -64,6 +64,9 @@ type SystemServerClasspathModule struct { ClasspathFragmentBase properties systemServerClasspathFragmentProperties + + // Collect the module directory for IDE info in java/jdeps.go. + modulePaths []string } func (s *SystemServerClasspathModule) ShouldSupportSdkVersion(ctx android.BaseModuleContext, sdkVersion android.ApiLevel) error { @@ -93,6 +96,9 @@ func (s *SystemServerClasspathModule) GenerateAndroidBuildActions(ctx android.Mo classpathJars := configuredJarListToClasspathJars(ctx, s.ClasspathFragmentToConfiguredJarList(ctx), s.classpathType) s.classpathFragmentBase().generateClasspathProtoBuildActions(ctx, classpathJars) + + // Collect the module directory for IDE info in java/jdeps.go. + s.modulePaths = append(s.modulePaths, ctx.ModuleDir()) } func (s *SystemServerClasspathModule) ClasspathFragmentToConfiguredJarList(ctx android.ModuleContext) android.ConfiguredJarList { @@ -139,3 +145,9 @@ func (s *SystemServerClasspathModule) ComponentDepsMutator(ctx android.BottomUpM ctx.AddDependency(module, systemServerClasspathFragmentContentDepTag, name) } } + +// Collect information for opening IDE project files in java/jdeps.go. +func (s *SystemServerClasspathModule) IDEInfo(dpInfo *android.IdeInfo) { + dpInfo.Deps = append(dpInfo.Deps, s.properties.Contents...) + dpInfo.Paths = append(dpInfo.Paths, s.modulePaths...) +} |