Merge "Stop collecting path entry for module_bp_java_deps.json from each module type" into main
This commit is contained in:
@@ -482,9 +482,6 @@ type apexBundle struct {
|
|||||||
nativeApisUsedByModuleFile android.ModuleOutPath
|
nativeApisUsedByModuleFile android.ModuleOutPath
|
||||||
nativeApisBackedByModuleFile android.ModuleOutPath
|
nativeApisBackedByModuleFile android.ModuleOutPath
|
||||||
javaApisUsedByModuleFile 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.
|
// 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.
|
// 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): do this using WalkPayloadDeps
|
||||||
// TODO(jiyong): make this clean!!!
|
// 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.Java_libs...)
|
||||||
dpInfo.Deps = append(dpInfo.Deps, a.properties.Bootclasspath_fragments...)
|
dpInfo.Deps = append(dpInfo.Deps, a.properties.Bootclasspath_fragments...)
|
||||||
dpInfo.Deps = append(dpInfo.Deps, a.properties.Systemserverclasspath_fragments...)
|
dpInfo.Deps = append(dpInfo.Deps, a.properties.Systemserverclasspath_fragments...)
|
||||||
dpInfo.Paths = append(dpInfo.Paths, a.modulePaths...)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
var (
|
var (
|
||||||
|
@@ -189,9 +189,6 @@ type Module struct {
|
|||||||
|
|
||||||
subName string
|
subName string
|
||||||
subDir string
|
subDir string
|
||||||
|
|
||||||
// Collect the module directory for IDE info in java/jdeps.go.
|
|
||||||
modulePaths []string
|
|
||||||
}
|
}
|
||||||
|
|
||||||
var _ android.MixedBuildBuildable = (*Module)(nil)
|
var _ android.MixedBuildBuildable = (*Module)(nil)
|
||||||
@@ -289,9 +286,6 @@ func (g *Module) ProcessBazelQueryResponse(ctx android.ModuleContext) {
|
|||||||
func (g *Module) generateCommonBuildActions(ctx android.ModuleContext) {
|
func (g *Module) generateCommonBuildActions(ctx android.ModuleContext) {
|
||||||
g.subName = ctx.ModuleSubDir()
|
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 {
|
if len(g.properties.Export_include_dirs) > 0 {
|
||||||
for _, dir := range g.properties.Export_include_dirs {
|
for _, dir := range g.properties.Export_include_dirs {
|
||||||
g.exportedIncludeDirs = append(g.exportedIncludeDirs,
|
g.exportedIncludeDirs = append(g.exportedIncludeDirs,
|
||||||
@@ -668,7 +662,6 @@ func (g *Module) IDEInfo(dpInfo *android.IdeInfo) {
|
|||||||
dpInfo.Deps = append(dpInfo.Deps, src)
|
dpInfo.Deps = append(dpInfo.Deps, src)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
dpInfo.Paths = append(dpInfo.Paths, g.modulePaths...)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func (g *Module) AndroidMk() android.AndroidMkData {
|
func (g *Module) AndroidMk() android.AndroidMkData {
|
||||||
|
@@ -497,9 +497,6 @@ type Module struct {
|
|||||||
// list of the xref extraction files
|
// list of the xref extraction files
|
||||||
kytheFiles android.Paths
|
kytheFiles android.Paths
|
||||||
|
|
||||||
// Collect the module directory for IDE info in java/jdeps.go.
|
|
||||||
modulePaths []string
|
|
||||||
|
|
||||||
hideApexVariantFromMake bool
|
hideApexVariantFromMake bool
|
||||||
|
|
||||||
sdkVersion android.SdkSpec
|
sdkVersion android.SdkSpec
|
||||||
@@ -2015,7 +2012,6 @@ func (j *Module) IDEInfo(dpInfo *android.IdeInfo) {
|
|||||||
if j.expandJarjarRules != nil {
|
if j.expandJarjarRules != nil {
|
||||||
dpInfo.Jarjar_rules = append(dpInfo.Jarjar_rules, j.expandJarjarRules.String())
|
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.Static_libs = append(dpInfo.Static_libs, j.properties.Static_libs...)
|
||||||
dpInfo.Libs = append(dpInfo.Libs, j.properties.Libs...)
|
dpInfo.Libs = append(dpInfo.Libs, j.properties.Libs...)
|
||||||
dpInfo.SrcJars = append(dpInfo.SrcJars, j.annoSrcJars.Strings()...)
|
dpInfo.SrcJars = append(dpInfo.SrcJars, j.annoSrcJars.Strings()...)
|
||||||
|
@@ -239,9 +239,6 @@ type BootclasspathFragmentModule struct {
|
|||||||
|
|
||||||
sourceOnlyProperties SourceOnlyBootclasspathProperties
|
sourceOnlyProperties SourceOnlyBootclasspathProperties
|
||||||
|
|
||||||
// Collect the module directory for IDE info in java/jdeps.go.
|
|
||||||
modulePaths []string
|
|
||||||
|
|
||||||
// Path to the boot image profile.
|
// Path to the boot image profile.
|
||||||
profilePath android.WritablePath
|
profilePath android.WritablePath
|
||||||
}
|
}
|
||||||
@@ -472,9 +469,6 @@ func (b *BootclasspathFragmentModule) GenerateAndroidBuildActions(ctx android.Mo
|
|||||||
// Generate classpaths.proto config
|
// Generate classpaths.proto config
|
||||||
b.generateClasspathProtoBuildActions(ctx)
|
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.
|
// Gather the bootclasspath fragment's contents.
|
||||||
var contents []android.Module
|
var contents []android.Module
|
||||||
ctx.VisitDirectDeps(func(module 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.
|
// Collect information for opening IDE project files in java/jdeps.go.
|
||||||
func (b *BootclasspathFragmentModule) IDEInfo(dpInfo *android.IdeInfo) {
|
func (b *BootclasspathFragmentModule) IDEInfo(dpInfo *android.IdeInfo) {
|
||||||
dpInfo.Deps = append(dpInfo.Deps, b.properties.Contents...)
|
dpInfo.Deps = append(dpInfo.Deps, b.properties.Contents...)
|
||||||
dpInfo.Paths = append(dpInfo.Paths, b.modulePaths...)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
type bootclasspathFragmentMemberType struct {
|
type bootclasspathFragmentMemberType struct {
|
||||||
|
@@ -720,9 +720,6 @@ func (j *Library) GenerateAndroidBuildActions(ctx android.ModuleContext) {
|
|||||||
}
|
}
|
||||||
j.compile(ctx, nil, nil, nil)
|
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()
|
exclusivelyForApex := !apexInfo.IsForPlatform()
|
||||||
if (Bool(j.properties.Installable) || ctx.Host()) && !exclusivelyForApex {
|
if (Bool(j.properties.Installable) || ctx.Host()) && !exclusivelyForApex {
|
||||||
var extraInstallDeps android.Paths
|
var extraInstallDeps android.Paths
|
||||||
|
@@ -75,7 +75,7 @@ func (j *jdepsGeneratorSingleton) GenerateBuildActions(ctx android.SingletonCont
|
|||||||
dpInfo.Jarjar_rules = android.FirstUniqueStrings(dpInfo.Jarjar_rules)
|
dpInfo.Jarjar_rules = android.FirstUniqueStrings(dpInfo.Jarjar_rules)
|
||||||
dpInfo.Jars = android.FirstUniqueStrings(dpInfo.Jars)
|
dpInfo.Jars = android.FirstUniqueStrings(dpInfo.Jars)
|
||||||
dpInfo.SrcJars = android.FirstUniqueStrings(dpInfo.SrcJars)
|
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.Static_libs = android.FirstUniqueStrings(dpInfo.Static_libs)
|
||||||
dpInfo.Libs = android.FirstUniqueStrings(dpInfo.Libs)
|
dpInfo.Libs = android.FirstUniqueStrings(dpInfo.Libs)
|
||||||
moduleInfos[name] = dpInfo
|
moduleInfos[name] = dpInfo
|
||||||
|
@@ -87,9 +87,6 @@ type SystemServerClasspathModule struct {
|
|||||||
ClasspathFragmentBase
|
ClasspathFragmentBase
|
||||||
|
|
||||||
properties systemServerClasspathFragmentProperties
|
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 {
|
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)
|
configuredJars = configuredJars.AppendList(&standaloneConfiguredJars)
|
||||||
classpathJars = append(classpathJars, standaloneClasspathJars...)
|
classpathJars = append(classpathJars, standaloneClasspathJars...)
|
||||||
s.classpathFragmentBase().generateClasspathProtoBuildActions(ctx, configuredJars, classpathJars)
|
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 {
|
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) {
|
func (s *SystemServerClasspathModule) IDEInfo(dpInfo *android.IdeInfo) {
|
||||||
dpInfo.Deps = append(dpInfo.Deps, s.properties.Contents...)
|
dpInfo.Deps = append(dpInfo.Deps, s.properties.Contents...)
|
||||||
dpInfo.Deps = append(dpInfo.Deps, s.properties.Standalone_contents...)
|
dpInfo.Deps = append(dpInfo.Deps, s.properties.Standalone_contents...)
|
||||||
dpInfo.Paths = append(dpInfo.Paths, s.modulePaths...)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
type systemServerClasspathFragmentMemberType struct {
|
type systemServerClasspathFragmentMemberType struct {
|
||||||
|
Reference in New Issue
Block a user