Merge "Allow sdk and core modules to use sysprop_library" am: a46c2b1994
am: ed000d7832
am: 4ad8d0d859
Change-Id: I001549e1fed24999f435e950c8b523dae01a6ed8
This commit is contained in:
@@ -619,12 +619,9 @@ func (j *Module) deps(ctx android.BottomUpMutatorContext) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
linkType, _ := j.getLinkType(ctx.ModuleName())
|
linkType, _ := j.getLinkType(ctx.ModuleName())
|
||||||
if linkType == javaSystem {
|
// only platform modules can use internal props
|
||||||
|
if linkType != javaPlatform {
|
||||||
ret[idx] = stub
|
ret[idx] = stub
|
||||||
} else if linkType != javaPlatform {
|
|
||||||
ctx.PropertyErrorf("sdk_version",
|
|
||||||
"can't link against sysprop_library %q from a module using public or core API",
|
|
||||||
lib)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user