commit 1b017a76e1d84626c0bd881625149dcd66174fe0
author Vishwath Mohan <vishwath@google.com> Thu Jan 19 13:54:55 2017 -0800
committer Vishwath Mohan <vishwath@google.com> Thu Jan 19 14:40:34 2017 -0800
tree ef7a4a201e5f782d2415bf7394288e2a7db61c85
parent 1a01e83725cabcef13941d3cc2216a32bd9ce851

Hide CFI behind a global flag.

This CL ensures that locally enabling CFI in a .bp file is not honored
unless it is enabled globally using ENABLE_CFI=true first, effectively
hiding it behind a flag.

Bug: 30227045
Bug: 22033465
Test: m -j40 works and device boots
Test: cfi is correctly honored only when the global flag is set.
Change-Id: Iccc6e4bf5e7828ab8ce6056f3e40922712faa0d8

android/variable.go

diff --git a/android/variable.go b/android/variable.go
index 271454a..bb84be2 100644
--- a/android/variable.go
+++ b/android/variable.go
@@ -124,6 +124,7 @@
 	UseGoma                    *bool `json:",omitempty"`
 	Debuggable                 *bool `json:",omitempty"`
 	Eng                        *bool `json:",omitempty"`
+	EnableCFI                  *bool `json:",omitempty"`
 
 	VendorPath *string `json:",omitempty"`