Merge "Fix: recovery module is disabled on 32-bit targets" (bdf16ec5) · Commits · e / os / android_build_soong

android/config.go

+4 −0

Original line number	Diff line number	Diff line
		@@ -576,6 +576,10 @@ func (c *config) DevicePrefer32BitExecutables() bool {
		return Bool(c.productVariables.DevicePrefer32BitExecutables)
		}

		func (c *config) DevicePrimaryArchType() ArchType {
		return c.Targets[Device][0].Arch.ArchType
		}

		func (c *config) SkipDeviceInstall() bool {
		return c.EmbeddedInMake()
		}

+6 −16

Original line number	Diff line number	Diff line
		@@ -1570,14 +1570,9 @@ func imageMutator(mctx android.BottomUpMutatorContext) {
		}

		if recoveryVariantNeeded {
		var recoveryMultilib string
		if mctx.Config().DevicePrefer32BitExecutables() {
		recoveryMultilib = "lib32"
		} else {
		recoveryMultilib = "lib64"
		}
		multilib := genrule.Target().Arch.ArchType.Multilib
		if multilib != recoveryMultilib {
		primaryArch := mctx.Config().DevicePrimaryArchType()
		moduleArch := genrule.Target().Arch.ArchType
		if moduleArch != primaryArch {
		recoveryVariantNeeded = false
		}
		}
		@@ -1690,14 +1685,9 @@ func imageMutator(mctx android.BottomUpMutatorContext) {
		}

		if recoveryVariantNeeded {
		var recoveryMultilib string
		if mctx.Config().DevicePrefer32BitExecutables() {
		recoveryMultilib = "lib32"
		} else {
		recoveryMultilib = "lib64"
		}
		multilib := m.Target().Arch.ArchType.Multilib
		if multilib != recoveryMultilib {
		primaryArch := mctx.Config().DevicePrimaryArchType()
		moduleArch := m.Target().Arch.ArchType
		if moduleArch != primaryArch {
		recoveryVariantNeeded = false
		}
		}