commit d5275c8657c4dd26ab74631856db139f32e270da
author Kostya Kortchinsky <kostyak@google.com> Fri Feb 01 08:42:56 2019 -0800
committer Kostya Kortchinsky <kostyak@google.com> Mon Feb 04 12:29:17 2019 -0800
tree 79b3a0bf31681a5f5271e7983371b735fcd21aa3
parent 54956abf1f578475d08bf9fbcdc12c9d733ff19d

Add option to disable Scudo globally [Soong]

This adds an option in Soong to turn off Scudo globally.

Bug: 123228023
Test: enable Scudo for tombstoned, lunch marlin_svelte-eng && m -j, and
make sure that Scudo is not linked in
out/target/product/marlin/system/bin/tombstoned
Test: enable Scudo for tombstoned, lunch marlin-userdebug && m -j, and
make sure that Scudo is linked in
out/target/product/marlin/system/bin/tombstoned

Change-Id: I0b0992446953fc4074bde94507b66f92764c8143
Merged-In: I0b0992446953fc4074bde94507b66f92764c8143

android/variable.go

diff --git a/android/variable.go b/android/variable.go
index 0904cea..f38cf25 100644
--- a/android/variable.go
+++ b/android/variable.go
@@ -213,6 +213,8 @@
 	CFIExcludePaths []string `json:",omitempty"`
 	CFIIncludePaths []string `json:",omitempty"`
 
+	DisableScudo *bool `json:",omitempty"`
+
 	EnableXOM       *bool    `json:",omitempty"`
 	XOMExcludePaths []string `json:",omitempty"`