apex: do not follow jni_libs from android_app
Because APK-in-APEX embeds its jni_libs in it. We don't have to follow
deps of jni_libs.
Bug: 146992436
Test: m com.android.tethering
deapexer extract com.android.tethering.apex apex
ls apex # there should be no /lib dir
Merged-In: Ifa1a6430a420ae7376b155cd59b8ece462cced7e
Change-Id: Ifa1a6430a420ae7376b155cd59b8ece462cced7e
(cherry picked from commit b7bebe2616184a02008d6ed3729845445a2310ca)
diff --git a/apex/apex.go b/apex/apex.go
index 712afe4..60d0f6c 100644
--- a/apex/apex.go
+++ b/apex/apex.go
@@ -2235,7 +2235,8 @@
return true // track transitive dependencies
}
} else if java.IsJniDepTag(depTag) {
- return true
+ // Because APK-in-APEX embeds jni_libs transitively, we don't need to track transitive deps
+ return false
} else if java.IsXmlPermissionsFileDepTag(depTag) {
if prebuilt, ok := child.(android.PrebuiltEtcModule); ok {
filesInfo = append(filesInfo, apexFileForPrebuiltEtc(ctx, prebuilt, depName))