Further simplify the link type check routine
Bug: 180477804 Test: m nothing Change-Id: I216be96cf844fe42ba0cec467eea8520ff4ef4f2
This commit is contained in:
parent
670e0f62a6
commit
7f87e1ab49
1 changed files with 8 additions and 28 deletions
36
java/java.go
36
java/java.go
|
@ -1014,6 +1014,7 @@ type linkType int
|
|||
const (
|
||||
// TODO(jiyong) rename these for better readability. Make the allowed
|
||||
// and disallowed link types explicit
|
||||
// order is important here. See rank()
|
||||
javaCore linkType = iota
|
||||
javaSdk
|
||||
javaSystem
|
||||
|
@ -1041,6 +1042,12 @@ func (lt linkType) String() string {
|
|||
}
|
||||
}
|
||||
|
||||
// rank determins the total order among linkTypes. A link type of rank A can link to another link
|
||||
// type of rank B only when B <= A
|
||||
func (lt linkType) rank() int {
|
||||
return int(lt)
|
||||
}
|
||||
|
||||
type linkTypeContext interface {
|
||||
android.Module
|
||||
getLinkType(name string) (ret linkType, stubs bool)
|
||||
|
@ -1101,34 +1108,7 @@ func checkLinkType(ctx android.ModuleContext, from *Module, to linkTypeContext,
|
|||
}
|
||||
otherLinkType, _ := to.getLinkType(ctx.OtherModuleName(to))
|
||||
|
||||
violation := false
|
||||
switch myLinkType {
|
||||
case javaCore:
|
||||
if otherLinkType != javaCore {
|
||||
violation = true
|
||||
}
|
||||
case javaSdk:
|
||||
if otherLinkType != javaCore && otherLinkType != javaSdk {
|
||||
violation = true
|
||||
}
|
||||
case javaSystem:
|
||||
if otherLinkType == javaPlatform || otherLinkType == javaModule || otherLinkType == javaSystemServer {
|
||||
violation = true
|
||||
}
|
||||
case javaModule:
|
||||
if otherLinkType == javaPlatform || otherLinkType == javaSystemServer {
|
||||
violation = true
|
||||
}
|
||||
case javaSystemServer:
|
||||
if otherLinkType == javaPlatform {
|
||||
violation = true
|
||||
}
|
||||
case javaPlatform:
|
||||
// no restriction on link-type
|
||||
break
|
||||
}
|
||||
|
||||
if violation {
|
||||
if myLinkType.rank() < otherLinkType.rank() {
|
||||
ctx.ModuleErrorf("compiles against %v, but dependency %q is compiling against %v. "+
|
||||
"In order to fix this, consider adjusting sdk_version: OR platform_apis: "+
|
||||
"property of the source or target module so that target module is built "+
|
||||
|
|
Loading…
Reference in a new issue