Merge "Hide CFI behind a global flag."

2017-01-20 01:32:43 +00:00
parent c0bf85a615 a5ff3e4133
commit 2d7fb30207
1 changed files with 1 additions and 0 deletions
--- a/core/soong_config.mk
+++ b/core/soong_config.mk
@@ -63,6 +63,7 @@ $(SOONG_VARIABLES): FORCE
 	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 ''; \