Merge "apex: do not follow jni_libs from android_app"

2020-02-26 02:35:10 +00:00
parent 9a63ee1b4f b7bebe2616
commit 077f9a44f9
2 changed files with 22 additions and 9 deletions
--- a/apex/apex.go
+++ b/apex/apex.go
@@ -2233,7 +2233,8 @@ func (a *apexBundle) GenerateAndroidBuildActions(ctx android.ModuleContext) {
 						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))