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

Commit cb1c956d authored by Pirama Arumuga Nainar's avatar Pirama Arumuga Nainar Committed by Automerger Merge Worker
Browse files

Merge "[cc/sanitize] Deprecate blacklist sub-property of sanitize" am:... 

Merge "[cc/sanitize] Deprecate blacklist sub-property of sanitize" am: 84ce8d8d am: eb037766 am: d8952eee

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

Change-Id: I490b2b45ab45f6996cd62518653025b67621d6a4
parents 58ccf759 d8952eee

cc/sanitize.go

+0 −8
Original line number Diff line number Diff line
@@ -177,8 +177,6 @@ type SanitizeProperties struct { 
		// value to pass to -fsanitize-recover=

		Recover []string



		// value to pass to -fsanitize-blacklist

		Blacklist *string

		// value to pass to -fsanitize-blacklist

		Blocklist *string

	} `android:"arch_variant"`
@@ -614,12 +612,6 @@ func (sanitize *sanitize) flags(ctx ModuleContext, flags Flags) Flags { 
			strings.Join(sanitize.Properties.Sanitize.Diag.No_recover, ","))

	}



	blacklist := android.OptionalPathForModuleSrc(ctx, sanitize.Properties.Sanitize.Blacklist)

	if blacklist.Valid() {

		flags.Local.CFlags = append(flags.Local.CFlags, "-fsanitize-blacklist="+blacklist.String())

		flags.CFlagsDeps = append(flags.CFlagsDeps, blacklist.Path())

	}



	blocklist := android.OptionalPathForModuleSrc(ctx, sanitize.Properties.Sanitize.Blocklist)

	if blocklist.Valid() {

		flags.Local.CFlags = append(flags.Local.CFlags, "-fsanitize-blacklist="+blocklist.String())