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

Merge "Hide CFI behind a global flag."

Browse Source
This commit is contained in:
Vishwath Mohan
2017-01-20 01:32:43 +00:00
committed by Gerrit Code Review
parent 0fe7253718 1b017a76e1
commit 97673c06d8
3 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
android/config.go
View File

@@ -398,6 +398,10 @@ func (c *config) SanitizeDeviceArch() []string {
return append([]string(nil), c.ProductVariables.SanitizeDeviceArch...) return append([]string(nil), c.ProductVariables.SanitizeDeviceArch...)
} }
func (c *config) EnableCFI() bool {
return Bool(c.ProductVariables.EnableCFI)
}
func (c *config) Android64() bool { func (c *config) Android64() bool {
for _, t := range c.Targets[Device] { for _, t := range c.Targets[Device] {
if t.Arch.ArchType.Multilib == "lib64" { if t.Arch.ArchType.Multilib == "lib64" {

1
android/variable.go
View File

@@ -124,6 +124,7 @@ type productVariables struct {
UseGoma *bool `json:",omitempty"` UseGoma *bool `json:",omitempty"`
Debuggable *bool `json:",omitempty"` Debuggable *bool `json:",omitempty"`
Eng *bool `json:",omitempty"` Eng *bool `json:",omitempty"`
EnableCFI *bool `json:",omitempty"`
VendorPath *string `json:",omitempty"` VendorPath *string `json:",omitempty"`

5
cc/sanitize.go
View File

@@ -161,6 +161,11 @@ func (sanitize *sanitize) begin(ctx BaseModuleContext) {
} }
} }
if !ctx.AConfig().EnableCFI() {
s.Cfi = nil
s.Diag.Cfi = nil
}
if ctx.staticBinary() { if ctx.staticBinary() {
s.Address = nil s.Address = nil
s.Coverage = nil s.Coverage = nil