commit a0bac3fb5fc869ea875757397ab0969e6feb298f
author Vishwath Mohan <vishwath@google.com> Fri Jan 20 02:06:16 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Jan 20 02:06:16 2017 +0000
tree 9f4fd745d84edfe94d3d11d95bc5064d166f5259
parent 9abc47d24f48879a4c2e1dadb470cdce612fe86a
parent d458faeeacf84ec57e18da5daad1259caf0f5109

Merge "Hide CFI behind a global flag." am: 2d7fb30207 am: 3ca34aeb7e am: 7baefbc0d4
am: d458faeeac

Change-Id: I297ab011fb901d6069672d034e2d8b8483ca21cb

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 ''; \