Merge "Fix: recovery module is disabled on 32-bit targets"

2 files changed, 10 insertions, 16 deletions

diff --git a/android/config.go b/android/config.go
index 3a9b98b3..7ba05c1b 100644
--- a/android/config.go
+++ b/android/config.go
@@ -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()
 }
diff --git a/cc/cc.go b/cc/cc.go
index 592f373a..8d050388 100644
--- a/cc/cc.go
+++ b/cc/cc.go
@@ -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
 		}
 	}