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

Merge "fix: required deps of phony modules are correctly tracked" into main

Browse Source
This commit is contained in:
Jiyong Park
2024-03-30 13:48:48 +00:00
committed by Gerrit Code Review
parent c654ad162c 9c540c82d4
commit 4d4eb59a2b
3 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
android/module.go
View File

@@ -1062,7 +1062,7 @@ func (m *ModuleBase) addRequiredDeps(ctx BottomUpMutatorContext) {
// TODO(jiyong): the Make-side does this only when the required module is a shared
// library or a native test.
bothInAndroid := m.Device() && target.Os.Class == Device
nativeArch := m.Arch().ArchType.Multilib != string(MultilibCommon)
nativeArch := InList(m.Arch().ArchType.Multilib, []string{"lib32", "lib64"})
sameBitness := m.Arch().ArchType.Multilib == target.Arch.ArchType.Multilib
if bothInAndroid && nativeArch && !sameBitness {
return