Merge "Change the global CFI flag to default to enabled." am: 45fd769588

am: 6e790c6a49

Change-Id: I45ee0c70c776576604fdf554a932574d1893bea9
This commit is contained in:
Vishwath Mohan
2017-04-20 01:46:55 +00:00
committed by android-build-merger

View File

@@ -77,7 +77,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 ' "EnableCFI": $(if $(filter false,$(ENABLE_CFI)),false,true),'; \
echo ''; \
echo ' "ArtUseReadBarrier": $(if $(filter false,$(PRODUCT_ART_USE_READ_BARRIER)),false,true),'; \
echo ''; \