diff options
| author | 2024-10-08 01:18:02 +0000 | |
|---|---|---|
| committer | 2024-10-08 01:18:02 +0000 | |
| commit | 56d95dc46c50e0c9384497cdb56ca390bedea56a (patch) | |
| tree | 96bc13ce603685b73fbcfb3e176044a07a399b3e /android/module.go | |
| parent | d224fcab8b898f2cd68b10360a1e3aa17d46ba09 (diff) | |
| parent | dc14bd11685d1b5e4b55eb8538f1cd4ee822d7cb (diff) | |
Merge "Drop `common_first` special-case from `addRequiredDeps`" into main
Diffstat (limited to 'android/module.go')
| -rw-r--r-- | android/module.go | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/android/module.go b/android/module.go index e3682fa30..44f7583a2 100644 --- a/android/module.go +++ b/android/module.go @@ -1003,14 +1003,6 @@ 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) |