diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-25 01:20:16 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-06-25 01:20:16 +0000 |
| commit | b6d0be942a30e043c3ba72ef1484dc1c3f69f6f3 (patch) | |
| tree | 693a824911d6d9e99433cd60a658a5ec44b9823b | |
| parent | 30d5c93f4738d86a21393bb2195fab146e1d074a (diff) | |
| parent | 74c7561dcc3bd8fb0cdcc9ad6a7e321ab4e69f9f (diff) | |
| download | build_make-b6d0be942a30e043c3ba72ef1484dc1c3f69f6f3.tar.gz build_make-b6d0be942a30e043c3ba72ef1484dc1c3f69f6f3.tar.bz2 build_make-b6d0be942a30e043c3ba72ef1484dc1c3f69f6f3.zip | |
Merge "Use inclusive language in build/make part 2" into rvc-dev
| -rw-r--r-- | core/config.mk | 1 | ||||
| -rw-r--r-- | core/main.mk | 3 | ||||
| -rw-r--r-- | core/product.mk | 1 |
3 files changed, 2 insertions, 3 deletions
diff --git a/core/config.mk b/core/config.mk index 0b9ff52bcf..90eea5ba99 100644 --- a/core/config.mk +++ b/core/config.mk @@ -123,6 +123,7 @@ $(KATI_obsolete_var MD5SUM) $(KATI_obsolete_var BOARD_HAL_STATIC_LIBRARIES, See $(CHANGES_URL)#BOARD_HAL_STATIC_LIBRARIES) $(KATI_obsolete_var LOCAL_HAL_STATIC_LIBRARIES, See $(CHANGES_URL)#BOARD_HAL_STATIC_LIBRARIES) $(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 diff --git a/core/main.mk b/core/main.mk index a7a69f086e..9e1d6b7024 100644 --- a/core/main.mk +++ b/core/main.mk @@ -1218,8 +1218,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)) \ diff --git a/core/product.mk b/core/product.mk index 3d96d23590..f8ba5936f8 100644 --- a/core/product.mk +++ b/core/product.mk @@ -333,7 +333,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 |