summaryrefslogtreecommitdiff
path: root/java/java.go
diff options
context:
space:
mode:
authorPeter Collingbourne <pcc@google.com>2019-12-16 13:40:14 -0800
committerPeter Collingbourne <pcc@google.com>2019-12-16 15:20:09 -0800
commit6f907ad3ddad9eb0e928ff7ad7965fa17a8a6946 (patch)
treeea14c9fe42271fbd27ab413f939f218b0b097a9e /java/java.go
parenta1682631ebb91342e6de421799f929c442c41c03 (diff)
Also package recursive jni_libs deps of android_apps as well as direct deps.
Previously, android_app targets for which a.shouldEmbedJnis(ctx) = true (e.g. CtsSelinuxTargetSdk25TestCases) would need to specify all of their recursive library dependencies, including for example libc++ when depending on the platform libc++. This means unnecessary churn when we add a new dependency to libc++ (e.g. libunwind [1]). To avoid the churn and allow jni_libs clauses to be simplified, make the build system search for the recursive dependencies and automatically include them. This change allows us to remove code that was previously adding NDK libc++ as a special case, as it is now covered by the generic code. Also fix some improper quoting that was exposed as a result of this change causing more files to be packaged than before. [1] https://android-review.googlesource.com/q/topic:%22libunwind-so%22 Bug: 144430859 Change-Id: I3d6fbcce75bc108a982eb7483992a4b202056339
Diffstat (limited to 'java/java.go')
-rw-r--r--java/java.go1
1 files changed, 0 insertions, 1 deletions
diff --git a/java/java.go b/java/java.go
index d8db5f8a4..cdae282bb 100644
--- a/java/java.go
+++ b/java/java.go
@@ -466,7 +466,6 @@ type dependencyTag struct {
type jniDependencyTag struct {
blueprint.BaseDependencyTag
- target android.Target
}
func IsJniDepTag(depTag blueprint.DependencyTag) bool {