Merge "Recovery partition uses the first architecture only" (87e50a0d) · Commits · e / os / android_build_soong

cc/cc.go

+26 −0

Original line number	Diff line number	Diff line
		@@ -1569,6 +1569,19 @@ func imageMutator(mctx android.BottomUpMutatorContext) {
		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 @@ func imageMutator(mctx android.BottomUpMutatorContext) {
		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)