Merge "Hide CFI behind a global flag." am: 2d7fb30207

am: 3ca34aeb7e

Change-Id: Ibbc53641416c7493a68bed50e3aea13afd3e1f2f
This commit is contained in:
Vishwath Mohan
2017-01-20 01:50:44 +00:00
committed by android-build-merger

View File

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