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

Commit d1cbfeaa authored by Colin Cross's avatar Colin Cross
Browse files

Use inclusive language in build/make part 2 

Test: m checkbuild
Bug: 158889297
Change-Id: I63bac680cc63a8564f35ae85dda1a0b09c9fd541
parent 5dda5cae

core/config.mk

+1 −0
Original line number Diff line number Diff line
@@ -150,6 +150,7 @@ $(KATI_obsolete_var \ 
  ,Project include variables have been removed)

$(KATI_obsolete_var TARGET_PREFER_32_BIT TARGET_PREFER_32_BIT_APPS TARGET_PREFER_32_BIT_EXECUTABLES)

$(KATI_obsolete_var PRODUCT_ARTIFACT_SYSTEM_CERTIFICATE_REQUIREMENT_WHITELIST,Use PRODUCT_ARTIFACT_SYSTEM_CERTIFICATE_REQUIREMENT_ALLOW_LIST.)

$(KATI_obsolete_var PRODUCT_ARTIFACT_PATH_REQUIREMENT_WHITELIST,Use PRODUCT_ARTIFACT_PATH_REQUIREMENT_ALLOWED_LIST.)



# Used to force goals to build.  Only use for conditionally defined goals.

.PHONY: FORCE

core/main.mk

+1 −2
Original line number Diff line number Diff line
@@ -1288,8 +1288,7 @@ $(call dist-for-goals,droidcore,$(CERTIFICATE_VIOLATION_MODULES_FILENAME)) 
    $(eval extra_files := $(filter-out $(files) $(HOST_OUT)/%,$(product_target_FILES))) \

    $(eval files_in_requirement := $(filter $(path_patterns),$(extra_files))) \

    $(eval all_offending_files += $(files_in_requirement)) \

    $(eval allowed := $(strip $(PRODUCT_ARTIFACT_PATH_REQUIREMENT_WHITELIST) \

      $(PRODUCT_ARTIFACT_PATH_REQUIREMENT_ALLOWED_LIST))) \

    $(eval allowed := $(PRODUCT_ARTIFACT_PATH_REQUIREMENT_ALLOWED_LIST)) \

    $(eval allowed_patterns := $(call resolve-product-relative-paths,$(allowed))) \

    $(eval offending_files := $(filter-out $(allowed_patterns),$(files_in_requirement))) \

    $(eval enforcement := $(PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS)) \

core/product.mk

+0 −1
Original line number Diff line number Diff line
@@ -328,7 +328,6 @@ _product_single_value_vars += PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS 
_product_single_value_vars += PRODUCT_ENFORCE_ARTIFACT_SYSTEM_CERTIFICATE_REQUIREMENT

_product_list_vars += PRODUCT_ARTIFACT_SYSTEM_CERTIFICATE_REQUIREMENT_ALLOW_LIST

_product_list_vars += PRODUCT_ARTIFACT_PATH_REQUIREMENT_HINT

_product_list_vars += PRODUCT_ARTIFACT_PATH_REQUIREMENT_WHITELIST

_product_list_vars += PRODUCT_ARTIFACT_PATH_REQUIREMENT_ALLOWED_LIST



# List of modules that should be forcefully unmarked from being LOCAL_PRODUCT_MODULE, and hence