Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 32d2f8f3 authored by Colin Cross's avatar Colin Cross Committed by Automerger Merge Worker
Browse files

Merge changes from topic "musl_arm64" am: b3f28b2e am: 222511ff am: 4d392045 

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2575412



Change-Id: I050ebf7373d1377074f626c27d7eef1d17ee21c7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2b54c09a 4d392045

cc/sanitize.go

+15 −0
Original line number Diff line number Diff line
@@ -665,6 +665,21 @@ func (sanitize *sanitize) begin(ctx BaseModuleContext) { 
		s.Diag.Cfi = nil

	}



	// TODO(b/280478629): runtimes don't exist for musl arm64 yet.

	if ctx.toolchain().Musl() && ctx.Arch().ArchType == android.Arm64 {

		s.Address = nil

		s.Hwaddress = nil

		s.Thread = nil

		s.Scudo = nil

		s.Fuzzer = nil

		s.Cfi = nil

		s.Diag.Cfi = nil

		s.Misc_undefined = nil

		s.Undefined = nil

		s.All_undefined = nil

		s.Integer_overflow = nil

	}



	// Also disable CFI for VNDK variants of components

	if ctx.isVndk() && ctx.useVndk() {

		s.Cfi = nil