Merge "Change the global CFI flag to default to enabled."

am: 9ce4529614 Change-Id: I671aff3c64d333668215d5cdfd830fe1d8f08331
2017-04-20 01:45:02 +00:00
parent e0abd1c0ab 9ce4529614
commit 848558ec1f
1 changed files with 5 additions and 1 deletions
--- a/android/config.go
+++ b/android/config.go
@@ -406,7 +406,11 @@ func (c *config) SanitizeDeviceArch() []string {
 }

 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 {