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

Commit c63c4306 authored by Aditya Kumar's avatar Aditya Kumar Committed by Gerrit Code Review
Browse files

Merge "Add deps to blocklist path" into main

parents 52a08486 6e6f5228

cc/sanitize.go

+1 −0
Original line number Diff line number Diff line
@@ -858,6 +858,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
@@ -580,6 +580,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,