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

Don't create SDK variants for native bridge modules

Browse Source 
Native bridge modules never need to build against NDK stubs, so
don't create SDK variants.  Also clear the sdk_version property
for modules that don't have SDK variants so that later code doesn't
use it to trigger SDK behaviors.

Test: m checkbuild
Change-Id: I1920fa82e9fab06235f01a62624382efa16cc6e3
This commit is contained in:
Colin Cross
2021-01-19 14:56:07 -08:00
parent 86cc40a74c
commit 94e347e6a5
5 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cc/cc.go
View File

@@ -1046,7 +1046,8 @@ func (c *Module) UseVndk() bool {
}
func (c *Module) canUseSdk() bool {
return c.Os() == android.Android && !c.UseVndk() && !c.InRamdisk() && !c.InRecovery() && !c.InVendorRamdisk()
return c.Os() == android.Android && c.Target().NativeBridge == android.NativeBridgeDisabled &&
!c.UseVndk() && !c.InRamdisk() && !c.InRecovery() && !c.InVendorRamdisk()
}
func (c *Module) UseSdk() bool {