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

Commit 3edec215 authored by Trevor Radcliffe's avatar Trevor Radcliffe Committed by Gerrit Code Review
Browse files

Merge "Update name of blocklist feature in bp2build" into main

parents b35cc91b d7148717

bp2build/cc_binary_conversion_test.go

+1 −1
Original line number Diff line number Diff line
@@ -881,7 +881,7 @@ func TestCcBinaryWithSanitizerBlocklist(t *testing.T) { 
		targets: []testBazelTarget{

			{"cc_binary", "foo", AttrNameToString{

				"local_includes": `["."]`,

				"features":       `["ubsan_blocklist_foo_blocklist_txt"]`,

				"features":       `["sanitizer_blocklist_foo_blocklist_txt"]`,

			}},

		},

	})

bp2build/cc_library_conversion_test.go

+2 −2
Original line number Diff line number Diff line
@@ -4194,11 +4194,11 @@ cc_library { 
`,

		ExpectedBazelTargets: []string{

			MakeBazelTarget("cc_library_static", "foo_bp2build_cc_library_static", AttrNameToString{

				"features":       `["ubsan_blocklist_foo_blocklist_txt"]`,

				"features":       `["sanitizer_blocklist_foo_blocklist_txt"]`,

				"local_includes": `["."]`,

			}),

			MakeBazelTarget("cc_library_shared", "foo", AttrNameToString{

				"features":       `["ubsan_blocklist_foo_blocklist_txt"]`,

				"features":       `["sanitizer_blocklist_foo_blocklist_txt"]`,

				"local_includes": `["."]`,

			}),

		},

bp2build/cc_library_shared_conversion_test.go

+1 −1
Original line number Diff line number Diff line
@@ -1225,7 +1225,7 @@ cc_library_shared { 
`,

		ExpectedBazelTargets: []string{

			MakeBazelTarget("cc_library_shared", "foo", AttrNameToString{

				"features":       `["ubsan_blocklist_foo_blocklist_txt"]`,

				"features":       `["sanitizer_blocklist_foo_blocklist_txt"]`,

				"local_includes": `["."]`,

			}),

		},

bp2build/cc_library_static_conversion_test.go

+1 −1
Original line number Diff line number Diff line
@@ -1918,7 +1918,7 @@ cc_library_static { 
`,

		ExpectedBazelTargets: []string{

			MakeBazelTarget("cc_library_static", "foo", AttrNameToString{

				"features":       `["ubsan_blocklist_foo_blocklist_txt"]`,

				"features":       `["sanitizer_blocklist_foo_blocklist_txt"]`,

				"local_includes": `["."]`,

			}),

		},

cc/bp2build.go

+1 −1
Original line number Diff line number Diff line
@@ -1819,7 +1819,7 @@ func bp2buildSanitizerFeatures(ctx android.BazelConversionPathContext, m *Module 
			if blocklist != nil {

				// Format the blocklist name to be used in a feature name

				blocklistFeatureSuffix := strings.Replace(strings.ToLower(*blocklist), ".", "_", -1)

				features = append(features, "ubsan_blocklist_"+blocklistFeatureSuffix)

				features = append(features, "sanitizer_blocklist_"+blocklistFeatureSuffix)

			}

			if sanitizerProps.Sanitize.Cfi != nil && !proptools.Bool(sanitizerProps.Sanitize.Cfi) {

				features = append(features, "-android_cfi")