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/library.go
View File

@@ -331,7 +331,6 @@ func libraryBp2Build(ctx android.Bp2buildMutatorContext, m *Module) {
sharedFeatures.DeduplicateAxesFromBase()
staticFeatures := baseAttributes.features.Clone().Append(staticAttrs.Features)
staticFeatures.DeduplicateAxesFromBase()
staticFeatures.RemoveFromAllConfigs(cfiFeatureName)
staticCommonAttrs := staticOrSharedAttributes{
Srcs: *srcs.Clone().Append(staticAttrs.Srcs),
@@ -2948,9 +2947,6 @@ func sharedOrStaticLibraryBp2Build(ctx android.Bp2buildMutatorContext, module *M
features := baseAttributes.features.Clone().Append(libSharedOrStaticAttrs.Features)
features.DeduplicateAxesFromBase()
if isStatic {
features.RemoveFromAllConfigs(cfiFeatureName)
}
commonAttrs := staticOrSharedAttributes{
Srcs: compilerAttrs.srcs,