Replace jniDependencyTag with a value
Support GetDirectDepsWithTag on JNI deps by replacing the jniDependencyTag type with a jniLibTag value. Test: app_test.go Change-Id: I8d66a5d3f433562e131a1fbafce75891d1b094dd
This commit is contained in:
10
java/java.go
10
java/java.go
@@ -547,13 +547,8 @@ type dependencyTag struct {
|
||||
name string
|
||||
}
|
||||
|
||||
type jniDependencyTag struct {
|
||||
blueprint.BaseDependencyTag
|
||||
}
|
||||
|
||||
func IsJniDepTag(depTag blueprint.DependencyTag) bool {
|
||||
_, ok := depTag.(*jniDependencyTag)
|
||||
return ok
|
||||
return depTag == jniLibTag
|
||||
}
|
||||
|
||||
var (
|
||||
@@ -573,6 +568,7 @@ var (
|
||||
instrumentationForTag = dependencyTag{name: "instrumentation_for"}
|
||||
usesLibTag = dependencyTag{name: "uses-library"}
|
||||
extraLintCheckTag = dependencyTag{name: "extra-lint-check"}
|
||||
jniLibTag = dependencyTag{name: "jnilib"}
|
||||
)
|
||||
|
||||
func IsLibDepTag(depTag blueprint.DependencyTag) bool {
|
||||
@@ -1001,7 +997,7 @@ func (j *Module) collectDeps(ctx android.ModuleContext) deps {
|
||||
otherName := ctx.OtherModuleName(module)
|
||||
tag := ctx.OtherModuleDependencyTag(module)
|
||||
|
||||
if _, ok := tag.(*jniDependencyTag); ok {
|
||||
if IsJniDepTag(tag) {
|
||||
// Handled by AndroidApp.collectAppDeps
|
||||
return
|
||||
}
|
||||
|
Reference in New Issue
Block a user