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

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

Merge "Add CHECK_DEV_TYPE_VIOLATIONS" into main

parents 8a64367c aa9a4a49

core/android_soong_config_vars.mk

+1 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ $(call add_soong_config_var,ANDROID,TARGET_DYNAMIC_64_32_DRMSERVER) 
$(call add_soong_config_var,ANDROID,TARGET_ENABLE_MEDIADRM_64)

$(call add_soong_config_var,ANDROID,BOARD_USES_ODMIMAGE)

$(call add_soong_config_var,ANDROID,BOARD_USES_RECOVERY_AS_BOOT)

$(call add_soong_config_var,ANDROID,CHECK_DEV_TYPE_VIOLATIONS)

$(call add_soong_config_var,ANDROID,PRODUCT_INSTALL_DEBUG_POLICY_TO_SYSTEM_EXT)



# Default behavior for the tree wrt building modules or using prebuilts. This

core/product.mk

+3 −0
Original line number Diff line number Diff line
@@ -443,6 +443,9 @@ _product_single_value_vars += PRODUCT_VIRTUAL_AB_COW_VERSION 
# If set, determines whether the build system checks vendor seapp contexts violations.

_product_single_value_vars += PRODUCT_CHECK_VENDOR_SEAPP_VIOLATIONS



# If set, determines whether the build system checks dev type violations.

_product_single_value_vars += PRODUCT_CHECK_DEV_TYPE_VIOLATIONS



_product_list_vars += PRODUCT_AFDO_PROFILES



_product_single_value_vars += PRODUCT_NEXT_RELEASE_HIDE_FLAGGED_API

core/product_config.mk

+9 −0
Original line number Diff line number Diff line
@@ -578,6 +578,15 @@ else ifneq ($(PRODUCT_CHECK_VENDOR_SEAPP_VIOLATIONS),) 
endif

.KATI_READONLY := CHECK_VENDOR_SEAPP_VIOLATIONS



# Boolean variable determining if selinux labels of /dev are enforced

CHECK_DEV_TYPE_VIOLATIONS := false

ifneq ($(call math_gt,$(VSR_VENDOR_API_LEVEL),35),)

  CHECK_DEV_TYPE_VIOLATIONS := true

else ifneq ($(PRODUCT_CHECK_DEV_TYPE_VIOLATIONS),)

  CHECK_DEV_TYPE_VIOLATIONS := $(PRODUCT_CHECK_DEV_TYPE_VIOLATIONS)

endif

.KATI_READONLY := CHECK_DEV_TYPE_VIOLATIONS



define product-overrides-config

$$(foreach rule,$$(PRODUCT_$(1)_OVERRIDES),\

    $$(if $$(filter 2,$$(words $$(subst :,$$(space),$$(rule)))),,\