diff options
Diffstat (limited to 'android/module.go')
| -rw-r--r-- | android/module.go | 33 |
1 files changed, 27 insertions, 6 deletions
diff --git a/android/module.go b/android/module.go index 516810fcb..f48af4a03 100644 --- a/android/module.go +++ b/android/module.go @@ -1458,7 +1458,10 @@ func addCompatibilityConstraintForCompileMultilib(ctx *topDownMutatorContext, en // Returns a list of the constraint_value targets who enable this override. func productVariableConfigEnableAttribute(ctx *topDownMutatorContext) bazel.LabelListAttribute { result := bazel.LabelListAttribute{} - productVariableProps := ProductVariableProperties(ctx, ctx.Module()) + productVariableProps, errs := ProductVariableProperties(ctx, ctx.Module()) + for _, err := range errs { + ctx.ModuleErrorf("ProductVariableProperties error: %s", err) + } if productConfigProps, exists := productVariableProps["Enabled"]; exists { for productConfigProp, prop := range productConfigProps { flag, ok := prop.(*bool) @@ -1636,15 +1639,23 @@ func (b bp2buildInfo) BazelAttributes() []interface{} { } func (m *ModuleBase) addBp2buildInfo(info bp2buildInfo) { - if m.commonProperties.BazelConversionStatus.UnconvertedReason != nil { - panic(fmt.Errorf("bp2build: module '%s' marked unconvertible and also is converted", m.Name())) + reason := m.commonProperties.BazelConversionStatus.UnconvertedReason + if reason != nil { + panic(fmt.Errorf("bp2build: internal error trying to convert module '%s' marked unconvertible. Reason type %d: %s", + m.Name(), + reason.ReasonType, + reason.Detail)) } m.commonProperties.BazelConversionStatus.Bp2buildInfo = append(m.commonProperties.BazelConversionStatus.Bp2buildInfo, info) } func (m *ModuleBase) setBp2buildUnconvertible(reasonType bp2build_metrics_proto.UnconvertedReasonType, detail string) { if len(m.commonProperties.BazelConversionStatus.Bp2buildInfo) > 0 { - panic(fmt.Errorf("bp2build: module '%s' marked unconvertible and also is converted", m.Name())) + fmt.Println(m.commonProperties.BazelConversionStatus.Bp2buildInfo) + panic(fmt.Errorf("bp2build: internal error trying to mark converted module '%s' as unconvertible. Reason type %d: %s", + m.Name(), + reasonType, + detail)) } m.commonProperties.BazelConversionStatus.UnconvertedReason = &UnconvertedReason{ ReasonType: int(reasonType), @@ -3089,11 +3100,21 @@ func (b *baseModuleContext) ModuleFromName(name string) (blueprint.Module, bool) if !b.isBazelConversionMode() { panic("cannot call ModuleFromName if not in bazel conversion mode") } + var m blueprint.Module + var ok bool if moduleName, _ := SrcIsModuleWithTag(name); moduleName != "" { - return b.bp.ModuleFromName(moduleName) + m, ok = b.bp.ModuleFromName(moduleName) } else { - return b.bp.ModuleFromName(name) + m, ok = b.bp.ModuleFromName(name) + } + if !ok { + return m, ok + } + // If this module is not preferred, tried to get the prebuilt version instead + if a, aOk := m.(Module); aOk && !IsModulePrebuilt(a) && !IsModulePreferred(a) { + return b.ModuleFromName("prebuilt_" + name) } + return m, ok } func (b *baseModuleContext) VisitDirectDepsBlueprint(visit func(blueprint.Module)) { |