Merge "Drop `common_first` special-case from `addRequiredDeps`" into main (56d95dc4) · Commits · e / os / android_build_soong

android/module.go

+0 −8

Original line number	Diff line number	Diff line
		@@ -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)