openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

Merge "Update language to meet Android's inclusive language guidance"

This commit is contained in:
Treehugger Robot 2020-07-31 14:49:05 +00:00 committed by Gerrit Code Review
parent bb62634fbd 154ac1d870
commit c21f30ca8a
7 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/board_config.mk
View File

@ -16,7 +16,7 @@
# ###############################################################
# This file includes BoardConfig.mk for the device being built,
# and sanity-checks the variable defined therein.
# and checks the variable defined therein.
# ###############################################################
_board_strip_readonly_list := \
@ -167,7 +167,7 @@ $(foreach var,$(_board_true_false_vars), \
TARGET_CPU_VARIANT_RUNTIME := $(or $(TARGET_CPU_VARIANT_RUNTIME),$(TARGET_CPU_VARIANT))
TARGET_2ND_CPU_VARIANT_RUNTIME := $(or $(TARGET_2ND_CPU_VARIANT_RUNTIME),$(TARGET_2ND_CPU_VARIANT))
# The combo makefiles sanity-check and set defaults for various CPU configuration
# The combo makefiles check and set defaults for various CPU configuration
combo_target := TARGET_
combo_2nd_arch_prefix :=
include $(BUILD_SYSTEM)/combo/select.mk
@ -191,7 +191,7 @@ ifeq (,$(filter true,$(TARGET_SUPPORTS_32_BIT_APPS) $(TARGET_SUPPORTS_64_BIT_APP
TARGET_SUPPORTS_32_BIT_APPS := true
endif
# Sanity check to warn about likely cryptic errors later in the build.
# Quick check to warn about likely cryptic errors later in the build.
ifeq ($(TARGET_IS_64_BIT),true)
ifeq (,$(filter true false,$(TARGET_SUPPORTS_64_BIT_APPS)))
$(error Building a 32-bit-app-only product on a 64-bit device. \
@ -649,7 +649,7 @@ ifneq ($(TARGET_OTA_ALLOW_NON_AB),true)
endif
endif
# Sanity check for building generic OTA packages. Currently it only supports A/B OTAs.
# Quick check for building generic OTA packages. Currently it only supports A/B OTAs.
ifeq ($(PRODUCT_BUILD_GENERIC_OTA_PACKAGE),true)
ifneq ($(AB_OTA_UPDATER),true)
$(error PRODUCT_BUILD_GENERIC_OTA_PACKAGE with 'AB_OTA_UPDATER != true' is not supported)

2
core/combo/TARGET_linux-arm.mk
View File

@ -39,7 +39,7 @@ ifeq (,$(strip $(TARGET_$(combo_2nd_arch_prefix)CPU_VARIANT)))
TARGET_$(combo_2nd_arch_prefix)CPU_VARIANT := generic
endif
# This sanity checks TARGET_2ND_ARCH_VARIANT against the lists above.
# This quickly checks TARGET_2ND_ARCH_VARIANT against the lists above.
ifneq (,$(filter $(TARGET_$(combo_2nd_arch_prefix)CPU_VARIANT), $(KNOWN_ARMv82a_CORES)))
ifeq (,$(TARGET_$(combo_2nd_arch_prefix)ARCH_VARIANT))
TARGET_$(combo_2nd_arch_prefix)ARCH_VARIANT := armv8-2a

2
core/java_common.mk
View File

@ -231,7 +231,7 @@ $(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_JAVA_SOURCE_LIST := $(java_source_list_fi
$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_RMTYPEDEFS := $(LOCAL_RMTYPEDEFS)
# Sanity check class path vars.
# Quickly check class path vars.
disallowed_deps := $(foreach sdk,$(TARGET_AVAILABLE_SDK_VERSIONS),$(call resolve-prebuilt-sdk-module,$(sdk)))
disallowed_deps += $(foreach sdk,$(TARGET_AVAILABLE_SDK_VERSIONS),\
$(foreach sdk_lib,$(JAVA_SDK_LIBRARIES),$(call resolve-prebuilt-sdk-module,$(sdk),$(sdk_lib))))

6
core/line_coverage.mk
View File

@ -12,11 +12,11 @@
# -----------------------------------------------------------------
# TODO(b/148306195): Due this issue some fuzz targets cannot be built with
# line coverage instrumentation. For now we just blacklist them.
blacklisted_fuzz_targets := libneuralnetworks_fuzzer
# line coverage instrumentation. For now we just block them.
blocked_fuzz_targets := libneuralnetworks_fuzzer
fuzz_targets := $(ALL_FUZZ_TARGETS)
fuzz_targets := $(filter-out $(blacklisted_fuzz_targets),$(fuzz_targets))
fuzz_targets := $(filter-out $(blocked_fuzz_targets),$(fuzz_targets))
# Android components that considered critical.

2
core/main.mk
View File

@ -1226,7 +1226,7 @@ ifdef FULL_BUILD
# Strip :32 and :64 suffixes
_modules := $(patsubst %:32,%,$(_modules))
_modules := $(patsubst %:64,%,$(_modules))
# Sanity check all modules in PRODUCT_PACKAGES exist. We check for the
# Quickly check all modules in PRODUCT_PACKAGES exist. We check for the
# existence if either <module> or the <module>_32 variant.
_nonexistent_modules := $(foreach m,$(_modules), \
$(if $(or $(ALL_MODULES.$(m).PATH),$(call get-modules-for-2nd-arch,TARGET,$(m))),,$(m)))

4
core/product_config.mk
View File

@ -166,7 +166,7 @@ $(foreach makefile,$(ARTIFACT_PATH_REQUIREMENT_PRODUCTS),\
$(if $(filter-out $(makefile),$(PRODUCTS)),$(eval $(call import-products,$(makefile))))\
)
# Sanity check
# Quick check
$(check-all-products)
ifneq ($(filter dump-products, $(MAKECMDGOALS)),)
@ -201,7 +201,7 @@ endif # EMMA_INSTRUMENT
$(call strip-product-vars)
#############################################################################
# Sanity check and assign default values
# Quick check and assign default values
TARGET_DEVICE := $(PRODUCT_DEVICE)

13
tools/fs_config/fs_config_generator.py
View File

@ -299,11 +299,10 @@ class AIDHeaderParser(object):
Parses a C header file and extracts lines starting with #define AID_<name>
while capturing the OEM defined ranges and ignoring other ranges. It also
skips some hardcoded AIDs it doesn't need to generate a mapping for.
It provides some basic sanity checks. The information extracted from this
file can later be used to sanity check other things (like oem ranges) as
well as generating a mapping of names to uids. It was primarily designed to
parse the private/android_filesystem_config.h, but any C header should
work.
It provides some basic checks. The information extracted from this file can
later be used to quickly check other things (like oem ranges) as well as
generating a mapping of names to uids. It was primarily designed to parse
the private/android_filesystem_config.h, but any C header should work.
"""
_SKIP_AIDS = [
@ -394,7 +393,7 @@ class AIDHeaderParser(object):
def _handle_aid(self, identifier, value):
"""Handle an AID C #define.
Handles an AID, sanity checking, generating the friendly name and
Handles an AID, quick checking, generating the friendly name and
adding it to the internal maps. Internal use only.
Args:
@ -422,7 +421,7 @@ class AIDHeaderParser(object):
"""Process, check and populate internal data structures.
After parsing and generating the internal data structures, this method
is responsible for sanity checking ALL of the acquired data.
is responsible for quickly checking ALL of the acquired data.
Raises:
ValueError: With the message set to indicate the specific error.