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

Merge "Ignore cc.Module.HideFromMake when producing flattened apex Android.mk entries" am: a5b1ea248f am: 46c461b968

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

Change-Id: I360afe1bec4479f73e5fde005cde467236a00513
This commit is contained in:
Colin Cross
2021-04-30 15:06:34 +00:00
committed by Automerger Merge Worker
parent 3d1c6a5757 46c461b968
commit b56c6b9379
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apex/androidmk.go
View File

@@ -118,10 +118,6 @@ func (a *apexBundle) androidMkForFiles(w io.Writer, apexBundleName, apexName, mo
seenDataOutPaths := make(map[string]bool) seenDataOutPaths := make(map[string]bool)
for _, fi := range a.filesInfo { for _, fi := range a.filesInfo {
if ccMod, ok := fi.module.(*cc.Module); ok && ccMod.Properties.HideFromMake {
continue
}
linkToSystemLib := a.linkToSystemLib && fi.transitiveDep && fi.availableToPlatform() linkToSystemLib := a.linkToSystemLib && fi.transitiveDep && fi.availableToPlatform()
moduleName := a.fullModuleName(apexBundleName, &fi) moduleName := a.fullModuleName(apexBundleName, &fi)