commit 87e50a0d14a7d6e0cba4ce4bd7dc73fae5e06eaa
author Treehugger Robot <treehugger-gerrit@google.com> Wed Jun 20 01:11:10 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jun 20 01:11:10 2018 +0000
tree 3e06648434f386040d08d7b8fd89b77df3abdfa7
parent af322cc7c2318c7e05de42fd902cf73789aabf04
parent 413cc744b8c45838895aa81f75d22f856ef99a9e

Merge "Recovery partition uses the first architecture only"

cc/cc.go

diff --git a/cc/cc.go b/cc/cc.go
index 6438bcd..b7183d7 100644
--- a/cc/cc.go
+++ b/cc/cc.go
@@ -1569,6 +1569,19 @@
 				recoveryVariantNeeded = true
 			}
 
+			if recoveryVariantNeeded {
+				var recoveryMultilib string
+				if mctx.Config().DevicePrefer32BitExecutables() {
+					recoveryMultilib = "lib32"
+				} else {
+					recoveryMultilib = "lib64"
+				}
+				multilib := genrule.Target().Arch.ArchType.Multilib
+				if multilib != recoveryMultilib {
+					recoveryVariantNeeded = false
+				}
+			}
+
 			var variants []string
 			if coreVariantNeeded {
 				variants = append(variants, coreMode)
@@ -1676,6 +1689,19 @@
 		coreVariantNeeded = false
 	}
 
+	if recoveryVariantNeeded {
+		var recoveryMultilib string
+		if mctx.Config().DevicePrefer32BitExecutables() {
+			recoveryMultilib = "lib32"
+		} else {
+			recoveryMultilib = "lib64"
+		}
+		multilib := m.Target().Arch.ArchType.Multilib
+		if multilib != recoveryMultilib {
+			recoveryVariantNeeded = false
+		}
+	}
+
 	var variants []string
 	if coreVariantNeeded {
 		variants = append(variants, coreMode)