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

Commit b8b096a5 authored by Ivan Lozano's avatar Ivan Lozano Committed by android-build-merger
Browse files

Merge "Enable execute-only memory layouts by default." 

am: 77cd60ad

Change-Id: I0f5c45cce702550545bfd150fe156cc725d1feca
parents 4c28a7da 77cd60ad

core/binary.mk

+1 −1
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ ifneq ($(NATIVE_COVERAGE),true) 
  my_native_coverage := false

endif



ifeq ($(strip $(ENABLE_XOM)),true)

ifneq ($(strip $(ENABLE_XOM)),false)

  ifndef LOCAL_IS_HOST_MODULE

    my_xom := true

    # Disable XOM in excluded paths.

core/soong_config.mk

+1 −1
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ $(call add_json_bool, Safestack, $(filter true,$(USE_SAF 
$(call add_json_bool, EnableCFI,                         $(call invert_bool,$(filter false,$(ENABLE_CFI))))

$(call add_json_list, CFIExcludePaths,                   $(CFI_EXCLUDE_PATHS) $(PRODUCT_CFI_EXCLUDE_PATHS))

$(call add_json_list, CFIIncludePaths,                   $(CFI_INCLUDE_PATHS) $(PRODUCT_CFI_INCLUDE_PATHS))

$(call add_json_bool, EnableXOM,                         $(filter true,$(ENABLE_XOM)))

$(call add_json_bool, EnableXOM,                         $(call invert_bool,$(filter false,$(ENABLE_XOM))))

$(call add_json_list, XOMExcludePaths,                   $(XOM_EXCLUDE_PATHS) $(PRODUCT_XOM_EXCLUDE_PATHS))

$(call add_json_list, IntegerOverflowExcludePaths,       $(INTEGER_OVERFLOW_EXCLUDE_PATHS) $(PRODUCT_INTEGER_OVERFLOW_EXCLUDE_PATHS))