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

Commit 09ee73f2 authored by Colin Cross's avatar Colin Cross Committed by Automerger Merge Worker
Browse files

Merge "Use inclusive language in build/make part 2" am: e1ab4cb6 

Original change: https://android-review.googlesource.com/c/platform/build/+/1344806

Change-Id: I73962b9319367a5305ff35f16b0dad3a4e482ae0
parents 36b5ebb1 e1ab4cb6

core/config.mk

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

  ,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 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_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.

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

.PHONY: FORCE

.PHONY: FORCE

core/main.mk

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

    $(eval extra_files := $(filter-out $(files) $(HOST_OUT)/%,$(product_target_FILES))) \

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

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

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

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

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

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

      $(PRODUCT_ARTIFACT_PATH_REQUIREMENT_ALLOWED_LIST))) \

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

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

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

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

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

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

core/product.mk

+0 −1
Original line number Original line 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_single_value_vars += PRODUCT_ENFORCE_ARTIFACT_SYSTEM_CERTIFICATE_REQUIREMENT

_product_list_vars += PRODUCT_ARTIFACT_SYSTEM_CERTIFICATE_REQUIREMENT_ALLOW_LIST

_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_HINT

_product_list_vars += PRODUCT_ARTIFACT_PATH_REQUIREMENT_WHITELIST

_product_list_vars += PRODUCT_ARTIFACT_PATH_REQUIREMENT_ALLOWED_LIST

_product_list_vars += PRODUCT_ARTIFACT_PATH_REQUIREMENT_ALLOWED_LIST





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

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