From de78d138a152f6aac7e45968ffbe30c28da16fb0 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Fri, 9 Oct 2020 18:59:49 -0700 Subject: 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 --- java/java.go | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'java/java.go') diff --git a/java/java.go b/java/java.go index 2553a30bd..b06e604a9 100644 --- a/java/java.go +++ b/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 } -- cgit v1.2.3-59-g8ed1b