Merge changes from topic "reland_embedded_jni" into main

* changes:
  Install transitive deps of jni libs, but not the jni libs themselves
  Add SkipToTransitiveDepsTag interface for dependency tags
  Revert "Revert "Collect transitve deps of jni libs only for bund..."
  Revert^2 "Always embed jni libs and store uncompressed"

1 files changed, 11 insertions, 0 deletions

diff --git a/java/java.go b/java/java.go
index 0df96a3a5..fc7e5c5a3 100644
--- a/java/java.go
+++ b/java/java.go
@@ -368,6 +368,17 @@ type dependencyTag struct {
 	static bool
 }
 
+var _ android.SkipToTransitiveDepsTag = (*dependencyTag)(nil)
+
+func (depTag dependencyTag) SkipToTransitiveDeps() bool {
+	// jni_libs are not installed because they are always embedded into the app. However,
+	// transitive deps of jni_libs themselves should be installed along with the app.
+	if IsJniDepTag(depTag) {
+		return true
+	}
+	return false
+}
+
 // installDependencyTag is a dependency tag that is annotated to cause the installed files of the
 // dependency to be installed when the parent module is installed.
 type installDependencyTag struct {