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

Don't create version variations of sdk modules

Browse Source 
They are never used, skip creating them.

Test: m checkbuild
Change-Id: I4c8cd544327ae79b781f704be5a9064efdbdf2af
This commit is contained in:
Colin Cross
2020-09-25 18:47:38 -07:00
parent 3146c5cd67
commit 565cafdcb1
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cc/library.go
View File

@@ -1545,14 +1545,16 @@ func CanBeOrLinkAgainstVersionVariants(module interface {
Host() bool Host() bool
InRamdisk() bool InRamdisk() bool
InRecovery() bool InRecovery() bool
UseSdk() bool
}) bool { }) bool {
return !module.Host() && !module.InRamdisk() && !module.InRecovery() return !module.Host() && !module.InRamdisk() && !module.InRecovery() && !module.UseSdk()
} }
func CanBeVersionVariant(module interface { func CanBeVersionVariant(module interface {
Host() bool Host() bool
InRamdisk() bool InRamdisk() bool
InRecovery() bool InRecovery() bool
UseSdk() bool
CcLibraryInterface() bool CcLibraryInterface() bool
Shared() bool Shared() bool
Static() bool Static() bool

2
rust/rust.go
View File

@@ -1053,7 +1053,7 @@ func (mod *Module) DepsMutator(actx android.BottomUpMutatorContext) {
blueprint.Variation{Mutator: "link", Variation: "static"}), blueprint.Variation{Mutator: "link", Variation: "static"}),
cc.StaticDepTag(), deps.StaticLibs...) cc.StaticDepTag(), deps.StaticLibs...)
crtVariations := append(cc.GetCrtVariations(ctx, mod), commonDepVariations...) crtVariations := cc.GetCrtVariations(ctx, mod)
if deps.CrtBegin != "" { if deps.CrtBegin != "" {
actx.AddVariationDependencies(crtVariations, cc.CrtBeginDepTag, deps.CrtBegin) actx.AddVariationDependencies(crtVariations, cc.CrtBeginDepTag, deps.CrtBegin)
} }