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

Commit 3623aed5 authored by Cole Faust's avatar Cole Faust
Browse files

Remove occurances of $(strip $(sort)) 

$(sort) inherently strips, so there's no need for the extra call to
$(strip). In the current kati implementation, the strip incurs a
string copy even if it does nothing.

Bug: 406475346
Test: m nothing
Change-Id: I4511d58ebf855ffc47c1cbe88f3193bf6f04ed1d
parent 1a2477c5

core/board_config.mk

+2 −2
Original line number Diff line number Diff line
@@ -221,14 +221,14 @@ ifdef TARGET_DEVICE_DIR 
  board_config_mk := $(TARGET_DEVICE_DIR)/BoardConfig.mk

else

  board_config_mk := \

    $(strip $(sort $(wildcard \

    $(sort $(wildcard \

      $(SRC_TARGET_DIR)/board/$(TARGET_DEVICE)/BoardConfig.mk \

      device/generic/goldfish/board/$(TARGET_DEVICE)/BoardConfig.mk \

      device/google/cuttlefish/board/$(TARGET_DEVICE)/BoardConfig.mk \

      vendor/google/products/cuttlefish/pixel_watch/board/$(TARGET_DEVICE)/BoardConfig.mk \

      $(shell test -d device && find -L device -maxdepth 4 -path '*/$(TARGET_DEVICE)/BoardConfig.mk') \

      $(shell test -d vendor && find -L vendor -maxdepth 4 -path '*/$(TARGET_DEVICE)/BoardConfig.mk') \

    )))

    ))

  ifeq ($(board_config_mk),)

    $(error No config file found for TARGET_DEVICE $(TARGET_DEVICE))

  endif

core/layoutlib_data.mk

+6 −6
Original line number Diff line number Diff line
@@ -134,8 +134,8 @@ $(LAYOUTLIB_SBOM)/sbom-metadata.csv: 


	$(foreach f,$(_layoutlib_fonts_files), \

	  $(eval _module_name := $(ALL_INSTALLED_FILES.$f)) \

	  $(eval _module_path := $(strip $(sort $(ALL_MODULES.$(_module_name).PATH)))) \

	  $(eval _soong_module_type := $(strip $(sort $(ALL_MODULES.$(_module_name).SOONG_MODULE_TYPE)))) \

	  $(eval _module_path := $(sort $(ALL_MODULES.$(_module_name).PATH))) \

	  $(eval _soong_module_type := $(sort $(ALL_MODULES.$(_module_name).SOONG_MODULE_TYPE))) \

	  echo data/fonts/$(notdir $f),$(_module_path),$(_soong_module_type),,,,,$f,,, >> $@; \

	)
@@ -145,8 +145,8 @@ $(LAYOUTLIB_SBOM)/sbom-metadata.csv: 


	$(foreach f,$(_layoutlib_hyphen_files), \

	  $(eval _module_name := $(ALL_INSTALLED_FILES.$f)) \

	  $(eval _module_path := $(strip $(sort $(ALL_MODULES.$(_module_name).PATH)))) \

	  $(eval _soong_module_type := $(strip $(sort $(ALL_MODULES.$(_module_name).SOONG_MODULE_TYPE)))) \

	  $(eval _module_path := $(sort $(ALL_MODULES.$(_module_name).PATH))) \

	  $(eval _soong_module_type := $(sort $(ALL_MODULES.$(_module_name).SOONG_MODULE_TYPE))) \

	  echo data/hyphen-data/$(notdir $f),$(_module_path),$(_soong_module_type),,,,,$f,,, >> $@; \

	)
@@ -156,8 +156,8 @@ $(LAYOUTLIB_SBOM)/sbom-metadata.csv: 
	  $(eval _dist_file := $(patsubst data/windows/%,data/win/lib64/%,$(patsubst layoutlib_native/%,data/%,$(_dist_file)))) \

	  $(eval _dist_file := $(subst layoutlib.jar,data/layoutlib.jar,$(_dist_file))) \

	  $(eval _module_name := $(strip $(foreach m,$(ALL_MODULES),$(if $(filter $(_prebuilt_module_file),$(ALL_MODULES.$m.CHECKED)),$m)))) \

	  $(eval _module_path := $(strip $(sort $(ALL_MODULES.$(_module_name).PATH)))) \

	  $(eval _soong_module_type := $(strip $(sort $(ALL_MODULES.$(_module_name).SOONG_MODULE_TYPE)))) \

	  $(eval _module_path := $(sort $(ALL_MODULES.$(_module_name).PATH))) \

	  $(eval _soong_module_type := $(sort $(ALL_MODULES.$(_module_name).SOONG_MODULE_TYPE))) \

	  echo $(patsubst layoutlib_native/%,%,$(_dist_file)),$(_module_path),$(_soong_module_type),,,,,$(_prebuilt_module_file),,, >> $@; \

	)

core/sbom.mk

+4 −4
Original line number Diff line number Diff line
@@ -8,13 +8,13 @@ ifdef my_register_name 
  ifneq (, $(strip $(ALL_MODULES.$(my_register_name).INSTALLED)))

    $(foreach installed_file,$(ALL_MODULES.$(my_register_name).INSTALLED),\

      $(eval ALL_INSTALLED_FILES.$(installed_file) := $(my_register_name))\

      $(eval ALL_INSTALLED_FILES.$(installed_file).STATIC_LIBRARIES := $(foreach l,$(strip $(sort $(LOCAL_STATIC_LIBRARIES))),$l$(if $(LOCAL_2ND_ARCH_VAR_PREFIX),$($(my_prefix)2ND_ARCH_MODULE_SUFFIX))))\

      $(eval ALL_INSTALLED_FILES.$(installed_file).WHOLE_STATIC_LIBRARIES := $(foreach l,$(strip $(sort $(LOCAL_WHOLE_STATIC_LIBRARIES))),$l$(if $(LOCAL_2ND_ARCH_VAR_PREFIX),$($(my_prefix)2ND_ARCH_MODULE_SUFFIX))))\

      $(eval ALL_INSTALLED_FILES.$(installed_file).STATIC_LIBRARIES := $(foreach l,$(sort $(LOCAL_STATIC_LIBRARIES)),$l$(if $(LOCAL_2ND_ARCH_VAR_PREFIX),$($(my_prefix)2ND_ARCH_MODULE_SUFFIX))))\

      $(eval ALL_INSTALLED_FILES.$(installed_file).WHOLE_STATIC_LIBRARIES := $(foreach l,$(sort $(LOCAL_WHOLE_STATIC_LIBRARIES)),$l$(if $(LOCAL_2ND_ARCH_VAR_PREFIX),$($(my_prefix)2ND_ARCH_MODULE_SUFFIX))))\

    )

  endif

  ifeq (STATIC_LIBRARIES,$(LOCAL_MODULE_CLASS))

  ALL_STATIC_LIBRARIES.$(my_register_name).STATIC_LIBRARIES := $(foreach l,$(strip $(sort $(LOCAL_STATIC_LIBRARIES))),$l$($(my_prefix)2ND_ARCH_MODULE_SUFFIX))

  ALL_STATIC_LIBRARIES.$(my_register_name).WHOLE_STATIC_LIBRARIES := $(foreach l,$(strip $(sort $(LOCAL_WHOLE_STATIC_LIBRARIES))),$l$($(my_prefix)2ND_ARCH_MODULE_SUFFIX))

  ALL_STATIC_LIBRARIES.$(my_register_name).STATIC_LIBRARIES := $(foreach l,$(sort $(LOCAL_STATIC_LIBRARIES)),$l$($(my_prefix)2ND_ARCH_MODULE_SUFFIX))

  ALL_STATIC_LIBRARIES.$(my_register_name).WHOLE_STATIC_LIBRARIES := $(foreach l,$(sort $(LOCAL_WHOLE_STATIC_LIBRARIES)),$l$($(my_prefix)2ND_ARCH_MODULE_SUFFIX))

  ifdef LOCAL_SOONG_MODULE_TYPE

    ALL_STATIC_LIBRARIES.$(my_register_name).BUILT_FILE := $(LOCAL_PREBUILT_MODULE_FILE)

  endif

core/tasks/check-abi-dump-list.mk

+4 −4
Original line number Diff line number Diff line
@@ -104,17 +104,17 @@ PLATFORM_ABI_DUMPS := $(call find-abi-dump-paths,$(PLATFORM_ABI_DUMP_DIR)) 
$(check-abi-dump-list-timestamp): PRIVATE_LSDUMP_PATHS := $(LSDUMP_PATHS)

$(check-abi-dump-list-timestamp): PRIVATE_STUB_LIBRARIES := $(STUB_LIBRARIES)

$(check-abi-dump-list-timestamp):

	$(eval added_vndk_abi_dumps := $(strip $(sort $(filter-out \

	$(eval added_vndk_abi_dumps := $(sort $(filter-out \

	  $(call filter-abi-dump-names,LLNDK,$(PRIVATE_LSDUMP_PATHS)) libRS.so.lsdump, \

	  $(notdir $(VNDK_ABI_DUMPS))))))

	  $(notdir $(VNDK_ABI_DUMPS)))))

	$(if $(added_vndk_abi_dumps), \

	  echo -e "Found unexpected ABI reference dump files under $(VNDK_ABI_DUMP_DIR). It is caused by mismatch between Android.bp and the dump files. Run \`find \$${ANDROID_BUILD_TOP}/$(VNDK_ABI_DUMP_DIR) '(' -name $(subst $(space), -or -name ,$(added_vndk_abi_dumps)) ')' -delete\` to delete the dump files.")



	# TODO(b/314010764): Remove LLNDK tag after PLATFORM_SDK_VERSION is upgraded to 35.

	$(eval added_platform_abi_dumps := $(strip $(sort $(filter-out \

	$(eval added_platform_abi_dumps := $(sort $(filter-out \

	  $(call filter-abi-dump-names,APEX LLNDK PLATFORM,$(PRIVATE_LSDUMP_PATHS)) \

	  $(addsuffix .lsdump,$(PRIVATE_STUB_LIBRARIES)) libRS.so.lsdump, \

	  $(notdir $(PLATFORM_ABI_DUMPS))))))

	  $(notdir $(PLATFORM_ABI_DUMPS)))))

	$(if $(added_platform_abi_dumps), \

	  echo -e "Found unexpected ABI reference dump files under $(PLATFORM_ABI_DUMP_DIR). It is caused by mismatch between Android.bp and the dump files. Run \`find \$${ANDROID_BUILD_TOP}/$(PLATFORM_ABI_DUMP_DIR) '(' -name $(subst $(space), -or -name ,$(added_platform_abi_dumps)) ')' -delete\` to delete the dump files.")

core/version_util.mk

+1 −1
Original line number Diff line number Diff line
@@ -195,7 +195,7 @@ ifeq (REL,$(PLATFORM_VERSION_CODENAME)) 
else

  PLATFORM_SYSTEMSDK_VERSIONS += $(subst $(comma),$(space),$(PLATFORM_VERSION_ALL_CODENAMES))

endif

PLATFORM_SYSTEMSDK_VERSIONS := $(strip $(sort $(PLATFORM_SYSTEMSDK_VERSIONS)))

PLATFORM_SYSTEMSDK_VERSIONS := $(sort $(PLATFORM_SYSTEMSDK_VERSIONS))

.KATI_READONLY := PLATFORM_SYSTEMSDK_VERSIONS



.KATI_READONLY := PLATFORM_SECURITY_PATCH