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

Commit a5ff3e41 authored by Vishwath Mohan's avatar Vishwath Mohan
Browse files

Hide CFI behind a global flag. 

This CL ensures that locally enabling CFI in a .bp file is not honored
unless it is enabled globally using ENABLE_CFI=true first, effectively
hiding it behind a flag.

Bug: 30227045
Bug: 22033465
Test: m -j40 works and device boots
Test: cfi is correctly honored only when the global flag is set.
Change-Id: Id026302e7f714b90a9e2c996f7a9314f534f90c2
parent bb5c13d3

core/soong_config.mk

+1 −0
Original line number Diff line number Diff line
@@ -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 ''; \