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

Merge "Revert "Block CFI on static libraries"" into main

Browse Source
This commit is contained in:
Trevor Radcliffe
2023-09-21 18:15:25 +00:00
committed by Gerrit Code Review
parent a56002a473 85d55c2847
commit 44e4102362
8 changed files with 26 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cc/bp2build.go
View File

@@ -1987,9 +1987,9 @@ func bp2buildSanitizerFeatures(ctx android.BazelConversionPathContext, m *Module
sanitizerCompilerInputs.SetSelectValue(bazel.SanitizersEnabledAxis, bazel.SanitizersEnabled, bazel.MakeLabelListFromTargetNames([]string{*blocklist}))
}
if sanitizerProps.Sanitize.Cfi != nil && !proptools.Bool(sanitizerProps.Sanitize.Cfi) {
features = append(features, "-"+cfiFeatureName)
features = append(features, "-android_cfi")
} else if proptools.Bool(sanitizerProps.Sanitize.Cfi) {
features = append(features, cfiFeatureName)
features = append(features, "android_cfi")
if proptools.Bool(sanitizerProps.Sanitize.Config.Cfi_assembly_support) {
features = append(features, "android_cfi_assembly_support")
}