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

Commit 1cfd8af0 authored by Cindy Zhou's avatar Cindy Zhou Committed by Gerrit Code Review
Browse files

Merge "Add CFI support for assembly heavy libraries"

parents 05c2f3e2 8cd45dea

cc/sanitize.go

+9 −0
Original line number Diff line number Diff line
@@ -172,6 +172,12 @@ type SanitizeUserProps struct { 
		No_recover       []string

	}



	// Sanitizers to run with flag configuration specified

	Config struct {

		// Enables CFI support flags for assembly-heavy libraries

		Cfi_assembly_support *bool `android:"arch_variant"`

	}



	// value to pass to -fsanitize-recover=

	Recover []string
@@ -543,6 +549,9 @@ func (sanitize *sanitize) flags(ctx ModuleContext, flags Flags) Flags { 


		flags.Local.CFlags = append(flags.Local.CFlags, cfiCflags...)

		flags.Local.AsFlags = append(flags.Local.AsFlags, cfiAsflags...)

		if Bool(sanitize.Properties.Sanitize.Config.Cfi_assembly_support) {

			flags.Local.CFlags = append(flags.Local.CFlags, "-fno-sanitize-cfi-canonical-jump-tables")

		}

		// Only append the default visibility flag if -fvisibility has not already been set

		// to hidden.

		if !inList("-fvisibility=hidden", flags.Local.CFlags) {