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

Commit 6e6f5228 authored by AdityaK's avatar AdityaK
Browse files

Add deps to blocklist path 

Change-Id: Ib4e17c497035b071f7c61d9158c58b5c03d919ae
parent 0c8ed5e5

cc/sanitize.go

+1 −0
Original line number Diff line number Diff line
@@ -881,6 +881,7 @@ func (s *sanitize) flags(ctx ModuleContext, flags Flags) Flags { 


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

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

		flags.CFlagsDeps = append(flags.CFlagsDeps, android.PathForSource(ctx, cfiBlocklistPath + "/" + cfiBlocklistFilename))

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

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

		}

cc/testing.go

+1 −0
Original line number Diff line number Diff line
@@ -582,6 +582,7 @@ var PrepareForTestWithCcDefaultModules = android.GroupFixturePreparers( 
		"defaults/cc/common/crtend_so.c":       nil,

		"defaults/cc/common/crtend.c":          nil,

		"defaults/cc/common/crtbrand.c":        nil,

		"external/compiler-rt/lib/cfi/cfi_blocklist.txt":   nil,



		"defaults/cc/common/libclang_rt.ubsan_minimal.android_arm64.a": nil,

		"defaults/cc/common/libclang_rt.ubsan_minimal.android_arm.a":   nil,