diff options
| author | 2021-04-08 18:19:15 +0900 | |
|---|---|---|
| committer | 2021-04-08 18:20:39 +0900 | |
| commit | 94e22fd35e368f5362c3c78bec2054de23d9ac1f (patch) | |
| tree | 4d18560d03653222101a55cfc9c715d71e7a6608 /apex/apex.go | |
| parent | 64a90286c458b8bd001d2c2ef03bd0e2617c220f (diff) | |
Shared lib dependencies from rlib are included in APEX
This change fixes a bug that shared lib dependencies of an rlib is not
installed to the APEX even when the rlib is part of the APEX.
Bug: N/A
Test: m
Change-Id: I88fe461584499839d8018d6b4292374592e7562b
Diffstat (limited to 'apex/apex.go')
| -rw-r--r-- | apex/apex.go | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/apex/apex.go b/apex/apex.go index bad382aa8..880028f87 100644 --- a/apex/apex.go +++ b/apex/apex.go @@ -1927,6 +1927,10 @@ func (a *apexBundle) GenerateAndroidBuildActions(ctx android.ModuleContext) { filesInfo = append(filesInfo, af) return true // track transitive dependencies } + } else if rust.IsRlibDepTag(depTag) { + // Rlib is statically linked, but it might have shared lib + // dependencies. Track them. + return true } else if java.IsbootImageContentDepTag(depTag) { // Add the contents of the boot image to the apex. switch child.(type) { |