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

Commit 154ac1d8 authored by Joel Galenson's avatar Joel Galenson
Browse files

Update language to meet Android's inclusive language guidance 

See https://source.android.com/setup/contribute/respectful-code for reference.

Bug: 161896447
Test: Build
Change-Id: I8d33207c84f424e89f367b1c917661347402ae77
parent ad970e69

core/board_config.mk

+4 −4
Original line number Diff line number Diff line
@@ -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)

core/combo/TARGET_linux-arm.mk

+1 −1
Original line number Diff line number Diff line
@@ -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

core/java_common.mk

+1 −1
Original line number Diff line number Diff line
@@ -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))))

core/line_coverage.mk

+3 −3
Original line number Diff line number Diff line
@@ -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.

core/main.mk

+1 −1
Original line number Diff line number Diff line
@@ -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)))