diff options
| -rw-r--r-- | apex/apex.go | 6 | ||||
| -rw-r--r-- | genrule/genrule.go | 7 | ||||
| -rw-r--r-- | java/base.go | 4 | ||||
| -rw-r--r-- | java/bootclasspath_fragment.go | 7 | ||||
| -rw-r--r-- | java/java.go | 3 | ||||
| -rw-r--r-- | java/jdeps.go | 2 | ||||
| -rw-r--r-- | java/systemserver_classpath_fragment.go | 7 |
7 files changed, 1 insertions, 35 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 ( diff --git a/genrule/genrule.go b/genrule/genrule.go index 01cac5b1f..8f2c0475b 100644 --- a/genrule/genrule.go +++ b/genrule/genrule.go @@ -189,9 +189,6 @@ type Module struct { subName string subDir string - - // Collect the module directory for IDE info in java/jdeps.go. - modulePaths []string } var _ android.MixedBuildBuildable = (*Module)(nil) @@ -289,9 +286,6 @@ func (g *Module) ProcessBazelQueryResponse(ctx android.ModuleContext) { func (g *Module) generateCommonBuildActions(ctx android.ModuleContext) { g.subName = ctx.ModuleSubDir() - // Collect the module directory for IDE info in java/jdeps.go. - g.modulePaths = append(g.modulePaths, ctx.ModuleDir()) - if len(g.properties.Export_include_dirs) > 0 { for _, dir := range g.properties.Export_include_dirs { g.exportedIncludeDirs = append(g.exportedIncludeDirs, @@ -668,7 +662,6 @@ func (g *Module) IDEInfo(dpInfo *android.IdeInfo) { dpInfo.Deps = append(dpInfo.Deps, src) } } - dpInfo.Paths = append(dpInfo.Paths, g.modulePaths...) } func (g *Module) AndroidMk() android.AndroidMkData { diff --git a/java/base.go b/java/base.go index 3d7d3de01..fdc164e11 100644 --- a/java/base.go +++ b/java/base.go @@ -497,9 +497,6 @@ type Module struct { // list of the xref extraction files kytheFiles android.Paths - // Collect the module directory for IDE info in java/jdeps.go. - modulePaths []string - hideApexVariantFromMake bool sdkVersion android.SdkSpec @@ -2015,7 +2012,6 @@ func (j *Module) IDEInfo(dpInfo *android.IdeInfo) { if j.expandJarjarRules != nil { dpInfo.Jarjar_rules = append(dpInfo.Jarjar_rules, j.expandJarjarRules.String()) } - dpInfo.Paths = append(dpInfo.Paths, j.modulePaths...) dpInfo.Static_libs = append(dpInfo.Static_libs, j.properties.Static_libs...) dpInfo.Libs = append(dpInfo.Libs, j.properties.Libs...) dpInfo.SrcJars = append(dpInfo.SrcJars, j.annoSrcJars.Strings()...) 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 { diff --git a/java/java.go b/java/java.go index dd0418894..e882e94b2 100644 --- a/java/java.go +++ b/java/java.go @@ -719,9 +719,6 @@ func (j *Library) GenerateAndroidBuildActions(ctx android.ModuleContext) { } j.compile(ctx, nil, nil, nil) - // Collect the module directory for IDE info in java/jdeps.go. - j.modulePaths = append(j.modulePaths, ctx.ModuleDir()) - exclusivelyForApex := !apexInfo.IsForPlatform() if (Bool(j.properties.Installable) || ctx.Host()) && !exclusivelyForApex { var extraInstallDeps android.Paths diff --git a/java/jdeps.go b/java/jdeps.go index 4c8c11c5d..7e3a14f55 100644 --- a/java/jdeps.go +++ b/java/jdeps.go @@ -75,7 +75,7 @@ func (j *jdepsGeneratorSingleton) GenerateBuildActions(ctx android.SingletonCont dpInfo.Jarjar_rules = android.FirstUniqueStrings(dpInfo.Jarjar_rules) dpInfo.Jars = android.FirstUniqueStrings(dpInfo.Jars) dpInfo.SrcJars = android.FirstUniqueStrings(dpInfo.SrcJars) - dpInfo.Paths = android.FirstUniqueStrings(dpInfo.Paths) + dpInfo.Paths = []string{ctx.ModuleDir(module)} dpInfo.Static_libs = android.FirstUniqueStrings(dpInfo.Static_libs) dpInfo.Libs = android.FirstUniqueStrings(dpInfo.Libs) moduleInfos[name] = dpInfo diff --git a/java/systemserver_classpath_fragment.go b/java/systemserver_classpath_fragment.go index 17d301b70..30dd55fa9 100644 --- a/java/systemserver_classpath_fragment.go +++ b/java/systemserver_classpath_fragment.go @@ -87,9 +87,6 @@ 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 { @@ -129,9 +126,6 @@ func (s *SystemServerClasspathModule) GenerateAndroidBuildActions(ctx android.Mo configuredJars = configuredJars.AppendList(&standaloneConfiguredJars) classpathJars = append(classpathJars, standaloneClasspathJars...) s.classpathFragmentBase().generateClasspathProtoBuildActions(ctx, configuredJars, classpathJars) - - // Collect the module directory for IDE info in java/jdeps.go. - s.modulePaths = append(s.modulePaths, ctx.ModuleDir()) } func (s *SystemServerClasspathModule) configuredJars(ctx android.ModuleContext) android.ConfiguredJarList { @@ -242,7 +236,6 @@ func (s *SystemServerClasspathModule) ComponentDepsMutator(ctx android.BottomUpM func (s *SystemServerClasspathModule) IDEInfo(dpInfo *android.IdeInfo) { dpInfo.Deps = append(dpInfo.Deps, s.properties.Contents...) dpInfo.Deps = append(dpInfo.Deps, s.properties.Standalone_contents...) - dpInfo.Paths = append(dpInfo.Paths, s.modulePaths...) } type systemServerClasspathFragmentMemberType struct { |