diff options
| author | 2024-12-06 19:40:49 +0000 | |
|---|---|---|
| committer | 2024-12-06 19:40:49 +0000 | |
| commit | ec8d5f2dce7351a340231e02fc19c586cf4059a7 (patch) | |
| tree | 75c472d20a2f1f4bb7acfa07ee3e35e2c1398a27 /android/module.go | |
| parent | 012958b69fff4317dc5e505fa88ad2593a2bea62 (diff) | |
| parent | 495661b97b2679cf7fe2287c2b1c4a155d656db6 (diff) | |
Merge "Convert checkStaticLinkingToStubLibraries to use module proxy." into main am: 495661b97b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3356482
Change-Id: Iec67b50ae0fbc6c3e091b9abf8d571030efe68f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'android/module.go')
| -rw-r--r-- | android/module.go | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/android/module.go b/android/module.go index d703c1927..a9f6b9402 100644 --- a/android/module.go +++ b/android/module.go @@ -1870,6 +1870,7 @@ type CommonModuleInfo struct { CompileTarget Target SkipAndroidMkProcessing bool BaseModuleName string + CanHaveApexVariants bool } var CommonModuleInfoKey = blueprint.NewProvider[CommonModuleInfo]() @@ -2145,6 +2146,8 @@ func (m *ModuleBase) GenerateBuildActions(blueprintCtx blueprint.ModuleContext) } else { commonData.Enabled = m.commonProperties.Enabled.GetOrDefault(m.ConfigurableEvaluator(ctx), !m.Os().DefaultDisabled) } + am, ok := m.module.(ApexModule) + commonData.CanHaveApexVariants = ok && am.CanHaveApexVariants() SetProvider(ctx, CommonModuleInfoKey, commonData) if p, ok := m.module.(PrebuiltInterface); ok && p.Prebuilt() != nil { SetProvider(ctx, PrebuiltModuleProviderKey, PrebuiltModuleProviderData{}) |