Merge "Block CFI on static libraries" into main

This commit is contained in:
Trevor Radcliffe
2023-09-21 13:05:21 +00:00
committed by Gerrit Code Review
8 changed files with 70 additions and 26 deletions

View File

@@ -4593,7 +4593,6 @@ cc_library {
}`,
ExpectedBazelTargets: []string{
MakeBazelTarget("cc_library_static", "foo_bp2build_cc_library_static", AttrNameToString{
"features": `["android_cfi"]`,
"local_includes": `["."]`,
}),
MakeBazelTarget("cc_library_shared", "foo", AttrNameToString{
@@ -4622,10 +4621,6 @@ cc_library {
}`,
ExpectedBazelTargets: []string{
MakeBazelTarget("cc_library_static", "foo_bp2build_cc_library_static", AttrNameToString{
"features": `select({
"//build/bazel/platforms/os:android": ["android_cfi"],
"//conditions:default": [],
})`,
"local_includes": `["."]`,
}),
MakeBazelTarget("cc_library_shared", "foo", AttrNameToString{
@@ -4656,10 +4651,7 @@ cc_library {
}`,
ExpectedBazelTargets: []string{
MakeBazelTarget("cc_library_static", "foo_bp2build_cc_library_static", AttrNameToString{
"features": `[
"android_cfi",
"android_cfi_assembly_support",
]`,
"features": `["android_cfi_assembly_support"]`,
"local_includes": `["."]`,
}),
MakeBazelTarget("cc_library_shared", "foo", AttrNameToString{