StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update name of blocklist feature in bp2build" into main am: 3edec2151e am: 698a9bba8f

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

Change-Id: I019fddf14ae840b9061f60ac7b9aa5d6e8cacb3b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Trevor Radcliffe
2023-07-14 21:27:27 +00:00
committed by Automerger Merge Worker
parent 5a05e5d8dc 698a9bba8f
commit af61f218cf
5 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bp2build/cc_binary_conversion_test.go
View File

@@ -881,7 +881,7 @@ func TestCcBinaryWithSanitizerBlocklist(t *testing.T) {
targets: []testBazelTarget{ targets: []testBazelTarget{
{"cc_binary", "foo", AttrNameToString{ {"cc_binary", "foo", AttrNameToString{
"local_includes": `["."]`, "local_includes": `["."]`,
"features": `["ubsan_blocklist_foo_blocklist_txt"]`, "features": `["sanitizer_blocklist_foo_blocklist_txt"]`,
}}, }},
}, },
}) })

4
bp2build/cc_library_conversion_test.go
View File

@@ -4194,11 +4194,11 @@ cc_library {
`, `,
ExpectedBazelTargets: []string{ ExpectedBazelTargets: []string{
MakeBazelTarget("cc_library_static", "foo_bp2build_cc_library_static", AttrNameToString{ MakeBazelTarget("cc_library_static", "foo_bp2build_cc_library_static", AttrNameToString{
"features": `["ubsan_blocklist_foo_blocklist_txt"]`, "features": `["sanitizer_blocklist_foo_blocklist_txt"]`,
"local_includes": `["."]`, "local_includes": `["."]`,
}), }),
MakeBazelTarget("cc_library_shared", "foo", AttrNameToString{ MakeBazelTarget("cc_library_shared", "foo", AttrNameToString{
"features": `["ubsan_blocklist_foo_blocklist_txt"]`, "features": `["sanitizer_blocklist_foo_blocklist_txt"]`,
"local_includes": `["."]`, "local_includes": `["."]`,
}), }),
}, },

2
bp2build/cc_library_shared_conversion_test.go
View File

@@ -1225,7 +1225,7 @@ cc_library_shared {
`, `,
ExpectedBazelTargets: []string{ ExpectedBazelTargets: []string{
MakeBazelTarget("cc_library_shared", "foo", AttrNameToString{ MakeBazelTarget("cc_library_shared", "foo", AttrNameToString{
"features": `["ubsan_blocklist_foo_blocklist_txt"]`, "features": `["sanitizer_blocklist_foo_blocklist_txt"]`,
"local_includes": `["."]`, "local_includes": `["."]`,
}), }),
}, },

2
bp2build/cc_library_static_conversion_test.go
View File

@@ -1918,7 +1918,7 @@ cc_library_static {
`, `,
ExpectedBazelTargets: []string{ ExpectedBazelTargets: []string{
MakeBazelTarget("cc_library_static", "foo", AttrNameToString{ MakeBazelTarget("cc_library_static", "foo", AttrNameToString{
"features": `["ubsan_blocklist_foo_blocklist_txt"]`, "features": `["sanitizer_blocklist_foo_blocklist_txt"]`,
"local_includes": `["."]`, "local_includes": `["."]`,
}), }),
}, },

2
cc/bp2build.go
View File

@@ -1819,7 +1819,7 @@ func bp2buildSanitizerFeatures(ctx android.BazelConversionPathContext, m *Module
if blocklist != nil { if blocklist != nil {
// Format the blocklist name to be used in a feature name // Format the blocklist name to be used in a feature name
blocklistFeatureSuffix := strings.Replace(strings.ToLower(*blocklist), ".", "_", -1) 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) { if sanitizerProps.Sanitize.Cfi != nil && !proptools.Bool(sanitizerProps.Sanitize.Cfi) {
features = append(features, "-android_cfi") features = append(features, "-android_cfi")