StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes I67589bcc,Ibcfae390 am: 7cbdf81e95 am: 33f495f305 am: 13b9d25ed4

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1683868

Change-Id: Idb4d7af1bf9914bf7bf0306d04daf74ee992fc5e
This commit is contained in:
Paul Duffin
2021-04-22 15:05:03 +00:00
committed by Automerger Merge Worker
parent 67e20e2ff8 13b9d25ed4
commit 677de9427b
5 changed files with 69 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apex/apex.go
View File

@@ -1924,7 +1924,7 @@ func (a *apexBundle) GenerateAndroidBuildActions(ctx android.ModuleContext) {
// Rlib is statically linked, but it might have shared lib
// dependencies. Track them.
return true
} else if java.IsbootImageContentDepTag(depTag) {
} else if java.IsBootclasspathFragmentContentDepTag(depTag) {
// Add the contents of the bootclasspath fragment to the apex.
switch child.(type) {
case *java.Library, *java.SdkLibrary: