| commit | 9ce45296145df6b17f94cabe497aa9928b6b3c87 | [log] [tgz] |
|---|---|---|
| author | Vishwath Mohan <vishwath@google.com> | Thu Apr 20 01:39:55 2017 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Thu Apr 20 01:39:56 2017 +0000 |
| tree | c1eb5aec494ae924fe2193b0d63e50540dea24f8 | |
| parent | f7d5dd7b3519f61780acfcc8149cb434f8c8386b [diff] | |
| parent | c32c3ebfb9b1f1150d20f86cf92aa92779da696d [diff] |
Merge "Change the global CFI flag to default to enabled."
diff --git a/android/config.go b/android/config.go index 3c25485..8efa642 100644 --- a/android/config.go +++ b/android/config.go
@@ -406,7 +406,11 @@ } func (c *config) EnableCFI() bool { - return Bool(c.ProductVariables.EnableCFI) + if c.ProductVariables.EnableCFI == nil { + return true + } else { + return *c.ProductVariables.EnableCFI + } } func (c *config) Android64() bool {