From 1ad8e16fbe990163d415ae0dc7f8b47983e97ce0 Mon Sep 17 00:00:00 2001 From: Jiyong Park Date: Tue, 1 Dec 2020 23:40:09 +0900 Subject: stub variants also re-exports headers This change fixes a bug that headers are not re-exported from stub variants of a library, if the headers are not from header libs, but from shared or static libs. This is because only header lib dependencies are respected for stubs variants. The fix is as follows. 1) dependencies to the shared/static libs are added even for stubs variants. 2) instead, in depsToPaths, they are treated like header libs (i.e. don't contribute to linkFile) for the stubs variants. Bug: 174558745 Test: m Change-Id: Iab6c77e7817055d0f2d09cb114186b30164fc231 --- apex/apex.go | 2 ++ 1 file changed, 2 insertions(+) (limited to 'apex/apex.go') diff --git a/apex/apex.go b/apex/apex.go index 7ab74541f..b906b28f3 100644 --- a/apex/apex.go +++ b/apex/apex.go @@ -1697,6 +1697,8 @@ func (a *apexBundle) GenerateAndroidBuildActions(ctx android.ModuleContext) { filesInfo = append(filesInfo, af) return true // track transitive dependencies } + } else if cc.IsHeaderDepTag(depTag) { + // nothing } else if java.IsJniDepTag(depTag) { // Because APK-in-APEX embeds jni_libs transitively, we don't need to track transitive deps return false -- cgit v1.2.3-59-g8ed1b