diff options
Diffstat (limited to 'android/module.go')
-rw-r--r-- | android/module.go | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/android/module.go b/android/module.go index 1866d7a9d..20caae2d8 100644 --- a/android/module.go +++ b/android/module.go @@ -1005,6 +1005,14 @@ func addRequiredDeps(ctx BottomUpMutatorContext) { return } + // Do not create a dependency from common variant to arch variant for `common_first` modules + if multilib, _ := decodeMultilib(ctx, ctx.Module().base()); multilib == string(MultilibCommonFirst) { + commonVariant := ctx.Arch().ArchType.Multilib == "" + if bothInAndroid && commonVariant && InList(target.Arch.ArchType.Multilib, []string{"lib32", "lib64"}) { + return + } + } + variation := target.Variations() if ctx.OtherModuleFarDependencyVariantExists(variation, depName) { ctx.AddFarVariationDependencies(variation, RequiredDepTag, depName) @@ -2288,6 +2296,8 @@ func (e configurationEvalutor) EvaluateConfiguration(condition proptools.Configu } variable := condition.Arg(0) switch variable { + case "build_from_text_stub": + return proptools.ConfigurableValueBool(ctx.Config().BuildFromTextStub()) case "debuggable": return proptools.ConfigurableValueBool(ctx.Config().Debuggable()) case "use_debug_art": |