Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1f6f96e4 authored by Vishwath Mohan's avatar Vishwath Mohan Committed by android-build-merger
Browse files

Merge "Change the global CFI flag to default to enabled." am: 45fd7695 am: 6e790c6a

am: ee5e53cc

Change-Id: I11f7a72d18b8446e88c66659dfe69c3496b586cd
parents bb7ba040 ee5e53cc
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -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 ''; \