tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove references to SourceDepTag in module types am: 2d24c1b654

Browse source 
am: 069ebe6692

Change-Id: I0b7f249b3224ca8099f10eac53ee782f552ce951
This commit is contained in:
Colin Cross 2018-06-06 15:23:07 -07:00 committed by android-build-merger
commit 3a11cd03b8
3 changed files with 11 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cc/cc.go
View file

@ -1202,8 +1202,6 @@ func (c *Module) depsToPaths(ctx android.ModuleContext) PathDeps {
if ccDep == nil {
// handling for a few module types that aren't cc Module but that are also supported
switch depTag {
case android.DefaultsDepTag, android.SourceDepTag:
// Nothing to do
case genSourceDepTag:
if genRule, ok := dep.(genrule.SourceFileGenerator); ok {
depPaths.GeneratedSources = append(depPaths.GeneratedSources,
@ -1241,8 +1239,6 @@ func (c *Module) depsToPaths(ctx android.ModuleContext) PathDeps {
} else {
ctx.ModuleErrorf("module %q is not a genrule", depName)
}
default:
ctx.ModuleErrorf("depends on non-cc module %q", depName)
}
return
}

4
genrule/genrule.go
View file

@ -163,8 +163,6 @@ func (g *Module) GenerateAndroidBuildActions(ctx android.ModuleContext) {
if len(g.properties.Tools) > 0 {
ctx.VisitDirectDepsBlueprint(func(module blueprint.Module) {
switch ctx.OtherModuleDependencyTag(module) {
case android.SourceDepTag:
// Nothing to do
case hostToolDepTag:
tool := ctx.OtherModuleName(module)
var path android.OptionalPath
@ -201,8 +199,6 @@ func (g *Module) GenerateAndroidBuildActions(ctx android.ModuleContext) {
} else {
ctx.ModuleErrorf("host tool %q missing output file", tool)
}
default:
ctx.ModuleErrorf("unknown dependency on %q", ctx.OtherModuleName(module))
}
})
}

37
java/droiddoc.go
View file

@ -422,12 +422,16 @@ func (j *Javadoc) collectDeps(ctx android.ModuleContext) deps {
otherName := ctx.OtherModuleName(module)
tag := ctx.OtherModuleDependencyTag(module)
switch dep := module.(type) {
case Dependency:
switch tag {
case bootClasspathTag:
switch tag {
case bootClasspathTag:
if dep, ok := module.(Dependency); ok {
deps.bootClasspath = append(deps.bootClasspath, dep.ImplementationJars()...)
case libTag:
} else {
panic(fmt.Errorf("unknown dependency %q for %q", otherName, ctx.ModuleName()))
}
case libTag:
switch dep := module.(type) {
case Dependency:
deps.classpath = append(deps.classpath, dep.ImplementationJars()...)
if otherName == String(j.properties.Srcs_lib) {
srcs := dep.(SrcDependency).CompiledSrcs()
@ -447,12 +451,7 @@ func (j *Javadoc) collectDeps(ctx android.ModuleContext) deps {
}
deps.srcJars = append(deps.srcJars, dep.(SrcDependency).CompiledSrcJars()...)
}
default:
panic(fmt.Errorf("unknown dependency %q for %q", otherName, ctx.ModuleName()))
}
case SdkLibraryDependency:
switch tag {
case libTag:
case SdkLibraryDependency:
sdkVersion := String(j.properties.Sdk_version)
linkType := javaSdk
if strings.HasPrefix(sdkVersion, "system_") || strings.HasPrefix(sdkVersion, "test_") {
@ -461,23 +460,9 @@ func (j *Javadoc) collectDeps(ctx android.ModuleContext) deps {
linkType = javaPlatform
}
deps.classpath = append(deps.classpath, dep.HeaderJars(linkType)...)
default:
ctx.ModuleErrorf("dependency on java_sdk_library %q can only be in libs", otherName)
}
case android.SourceFileProducer:
switch tag {
case libTag:
case android.SourceFileProducer:
checkProducesJars(ctx, dep)
deps.classpath = append(deps.classpath, dep.Srcs()...)
case android.DefaultsDepTag, android.SourceDepTag:
// Nothing to do
default:
ctx.ModuleErrorf("dependency on genrule %q may only be in srcs, libs", otherName)
}
default:
switch tag {
case android.DefaultsDepTag, android.SourceDepTag, droiddocTemplateTag:
// Nothing to do
default:
ctx.ModuleErrorf("depends on non-java module %q", otherName)
}