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

Merge "Fix: required deps from native module to phony module is respected" into main

Browse Source
This commit is contained in:
Jiyong Park
2024-05-14 05:04:27 +00:00
committed by Gerrit Code Review
parent c3e6594a0d c4b1d55707
commit 635e1218bd
2 changed files with 34 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
android/module.go
View File

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