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

Commit d778640b authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Export variable for device sanitize arch to Soong"

parents 77ecb334 23618422

core/config_sanitizers.mk

+6 −4
Original line number Diff line number Diff line
@@ -31,11 +31,13 @@ ifneq ($(SANITIZER.$(TARGET_PRODUCT).$(LOCAL_MODULE).CONFIG),) 
  endif

endif



# Add a filter point for 32-bit vs 64-bit sanitization (to lighten the burden).

SANITIZE_ARCH ?= 32 64

ifeq ($(filter $(SANITIZE_ARCH),$(my_32_64_bit_suffix)),)

ifndef LOCAL_IS_HOST_MODULE

  # Add a filter point for 32-bit vs 64-bit sanitization (to lighten the burden)

  SANITIZE_TARGET_ARCH ?= $(TARGET_ARCH) $(TARGET_2ND_ARCH)

  ifeq ($(filter $(SANITIZE_TARGET_ARCH),$(TARGET_$(LOCAL_2ND_ARCH_VAR_PREFIX)ARCH)),)

    my_sanitize :=

  endif

endif



# Add a filter point based on module owner (to lighten the burden). The format is a space- or

# colon-separated list of owner names.

core/soong.mk

+1 −0
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ $(SOONG_VARIABLES): FORCE 
	echo '    "Allow_missing_dependencies": $(if $(TARGET_BUILD_APPS)$(filter true,$(SOONG_ALLOW_MISSING_DEPENDENCIES)),true,false),'; \

	echo '    "SanitizeHost": [$(if $(SANITIZE_HOST),"$(subst $(space),"$(comma)",$(SANITIZE_HOST))")],'; \

	echo '    "SanitizeDevice": [$(if $(SANITIZE_TARGET),"$(subst $(space),"$(comma)",$(SANITIZE_TARGET))")],'; \

	echo '    "SanitizeDeviceArch": [$(if $(SANITIZE_TARGET_ARCH),"$(subst $(space),"$(comma)",$(SANITIZE_TARGET_ARCH))")],'; \

	echo '    "HostStaticBinaries": $(if $(strip $(BUILD_HOST_static)),true,false),'; \

	echo '    "Cpusets": $(if $(strip $(ENABLE_CPUSETS)),true,false),'; \

	echo '    "Schedboost": $(if $(strip $(ENABLE_SCHEDBOOST)),true,false),'; \