commit 2d7fb30207f1c78f867bda6d21e24a5448181d41
author Vishwath Mohan <vishwath@google.com> Fri Jan 20 01:32:43 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jan 20 01:32:44 2017 +0000
tree e74d08aea45793f4f0257f2e6196012b16980856
parent c0bf85a615e12e181b21e6033b37c817761db15a
parent a5ff3e413323acf591fba7045e8c05549159dec1

Merge "Hide CFI behind a global flag."

core/soong_config.mk

diff --git a/core/soong_config.mk b/core/soong_config.mk
index da39981..7b1be47 100644
--- a/core/soong_config.mk
+++ b/core/soong_config.mk
@@ -63,6 +63,7 @@
 	echo '    "CrossHostArch": "$(HOST_CROSS_ARCH)",'; \
 	echo '    "CrossHostSecondaryArch": "$(HOST_CROSS_2ND_ARCH)",'; \
 	echo '    "Safestack": $(if $(filter true,$(USE_SAFESTACK)),true,false),'; \
+	echo '    "EnableCFI": $(if $(filter true,$(ENABLE_CFI)),true,false),'; \
 	echo ''; \
 	echo '    "ArtUseReadBarrier": $(if $(filter true,$(PRODUCT_ART_USE_READ_BARRIER)),true,false),'; \
 	echo ''; \