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

Commit 1c54f66b authored by Vishwath Mohan's avatar Vishwath Mohan
Browse files

Restrict CFI_INCLUDE_PATHS to Arm64 

This CL restricts CFI_INCLUDE_PATHS and PRODUCT_CFI_INCLUDE_PATHS to
Arm64 only.

Bug: 66301104
Test: x86 targets do not respect the include paths variables
Change-Id: I66ec2fb05435535aaf5d59fdfc7a170a4fdd4f26
parent 7589c82e

cc/sanitize.go

+2 −2
Original line number Diff line number Diff line
@@ -224,8 +224,8 @@ func (sanitize *sanitize) begin(ctx BaseModuleContext) { 
		}

	}



	// Enable CFI for all components in the include paths

	if s.Cfi == nil && ctx.Config().CFIEnabledForPath(ctx.ModuleDir()) {

	// Enable CFI for all components in the include paths (for Aarch64 only)

	if s.Cfi == nil && ctx.Config().CFIEnabledForPath(ctx.ModuleDir()) && ctx.Arch().ArchType == android.Arm64 {

		s.Cfi = boolPtr(true)

		if inList("cfi", ctx.Config().SanitizeDeviceDiag()) {

			s.Diag.Cfi = boolPtr(true)