Merge "Hide CFI behind a global flag."

am: 2d7fb30207

Change-Id: I40127230f3016e91d9c1010b0cfb9d95b95fa05f
This commit is contained in:
Vishwath Mohan 2017-01-20 01:45:43 +00:00 committed by android-build-merger
commit 3ca34aeb7e

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