summaryrefslogtreecommitdiff
path: root/android/variable.go
diff options
context:
space:
mode:
author Vishwath Mohan <vishwath@google.com> 2017-10-31 02:26:14 -0700
committer Vishwath Mohan <vishwath@google.com> 2017-11-08 18:56:10 -0800
commit1fa3ac552d3c55204520afad992280461f717228 (patch)
treea4f475eb88a8a5c1ce5dadfdb3bec744e7c916bb /android/variable.go
parent06643be323e69227b70de82adb85886df331fe9f (diff)
CFI include/exclude path support (Soong)
This CL adds the ability to centrally enable or disable CFI for components using either an environment or product config variable. This is a better, nore manageable option that enabling CFI across each component individually. Bug: 67507323 Test: CFI_INCLUDE_PATHS= system/nfc m -j40 Test: CFI_EXCLUDE_PATHS = frameworks/av m -j40 Change-Id: I38b77946759121aec99ab25f31aaee2e5d993f73
Diffstat (limited to 'android/variable.go')
-rw-r--r--android/variable.go5
1 files changed, 4 insertions, 1 deletions
diff --git a/android/variable.go b/android/variable.go
index 28841e22d..d89c14687 100644
--- a/android/variable.go
+++ b/android/variable.go
@@ -153,7 +153,6 @@ type productVariables struct {
UseGoma *bool `json:",omitempty"`
Debuggable *bool `json:",omitempty"`
Eng *bool `json:",omitempty"`
- EnableCFI *bool `json:",omitempty"`
Device_uses_hwc2 *bool `json:",omitempty"`
Treble *bool `json:",omitempty"`
Pdk *bool `json:",omitempty"`
@@ -162,6 +161,10 @@ type productVariables struct {
IntegerOverflowExcludePaths *[]string `json:",omitempty"`
+ EnableCFI *bool `json:",omitempty"`
+ CFIExcludePaths *[]string `json:",omitempty"`
+ CFIIncludePaths *[]string `json:",omitempty"`
+
VendorPath *string `json:",omitempty"`
ClangTidy *bool `json:",omitempty"`