diff options
| author | 2020-09-25 18:47:38 -0700 | |
|---|---|---|
| committer | 2020-10-05 18:57:26 -0700 | |
| commit | 565cafdcb1178c0d6804583546ecd8069439de0c (patch) | |
| tree | 12fd723ac15bfaa4d33de1793a09b3bba6c15067 | |
| parent | 3146c5cd67f728375aa9bdfa3b0643895a32411e (diff) | |
Don't create version variations of sdk modules
They are never used, skip creating them.
Test: m checkbuild
Change-Id: I4c8cd544327ae79b781f704be5a9064efdbdf2af
| -rw-r--r-- | cc/library.go | 4 | ||||
| -rw-r--r-- | rust/rust.go | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/cc/library.go b/cc/library.go index 059e29b9c..b5bec952a 100644 --- a/cc/library.go +++ b/cc/library.go @@ -1545,14 +1545,16 @@ func CanBeOrLinkAgainstVersionVariants(module interface { Host() bool InRamdisk() bool InRecovery() bool + UseSdk() bool }) bool { - return !module.Host() && !module.InRamdisk() && !module.InRecovery() + return !module.Host() && !module.InRamdisk() && !module.InRecovery() && !module.UseSdk() } func CanBeVersionVariant(module interface { Host() bool InRamdisk() bool InRecovery() bool + UseSdk() bool CcLibraryInterface() bool Shared() bool Static() bool diff --git a/rust/rust.go b/rust/rust.go index 1fc3b0e2c..9b18c8c76 100644 --- a/rust/rust.go +++ b/rust/rust.go @@ -1053,7 +1053,7 @@ func (mod *Module) DepsMutator(actx android.BottomUpMutatorContext) { blueprint.Variation{Mutator: "link", Variation: "static"}), cc.StaticDepTag(), deps.StaticLibs...) - crtVariations := append(cc.GetCrtVariations(ctx, mod), commonDepVariations...) + crtVariations := cc.GetCrtVariations(ctx, mod) if deps.CrtBegin != "" { actx.AddVariationDependencies(crtVariations, cc.CrtBeginDepTag, deps.CrtBegin) } |