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

Commit edc3e6cd authored by Dan Willemsen's avatar Dan Willemsen Committed by Gerrit Code Review
Browse files

Merge "Sort more instances of wildcard and find"

parents 604e532f 7c3e3f83

core/definitions.mk

+1 −1
Original line number Diff line number Diff line
@@ -415,7 +415,7 @@ endef 


define find-parent-file

$(strip \

  $(eval _fpf := $(wildcard $(foreach f, $(2), $(strip $(1))/$(f)))) \

  $(eval _fpf := $(sort $(wildcard $(foreach f, $(2), $(strip $(1))/$(f))))) \

  $(if $(_fpf),$(_fpf), \

       $(if $(filter-out ./ .,$(1)), \

             $(call find-parent-file,$(patsubst %/,%,$(dir $(1))),$(2)) \

core/droiddoc.mk

+2 −2
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ ifneq ($(strip $(LOCAL_DROIDDOC_USE_STANDARD_DOCLET)),true) 
##



droiddoc_templates := \

    $(shell find $(LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR) -type f)

    $(sort $(shell find $(LOCAL_DROIDDOC_CUSTOM_TEMPLATE_DIR) -type f))



droiddoc := \

	$(HOST_JDK_TOOLS_JAR) \
@@ -142,7 +142,7 @@ $(full_target): PRIVATE_OUT_CUSTOM_ASSET_DIR := $(out_dir)/$(LOCAL_DROIDDOC_CUST 
html_dir_files :=

ifneq ($(strip $(LOCAL_DROIDDOC_HTML_DIR)),)

$(full_target): PRIVATE_DROIDDOC_HTML_DIR := -htmldir $(LOCAL_PATH)/$(LOCAL_DROIDDOC_HTML_DIR)

html_dir_files := $(shell find $(LOCAL_PATH)/$(LOCAL_DROIDDOC_HTML_DIR) -type f)

html_dir_files := $(sort $(shell find $(LOCAL_PATH)/$(LOCAL_DROIDDOC_HTML_DIR) -type f))

else

$(full_target): PRIVATE_DROIDDOC_HTML_DIR :=

endif

core/envsetup.mk

+2 −2
Original line number Diff line number Diff line
@@ -134,11 +134,11 @@ SDK_HOST_ARCH := x86 
# make sure only one exists.

# Real boards should always be associated with an OEM vendor.

board_config_mk := \

	$(strip $(wildcard \

	$(strip $(sort $(wildcard \

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

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

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

	))

	)))

ifeq ($(board_config_mk),)

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

endif

core/java_common.mk

+2 −2
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ ifneq ($(LOCAL_JAVA_RESOURCE_DIRS),) 
    $(foreach dir,$(LOCAL_JAVA_RESOURCE_DIRS), \

	$(subst $(space),:,$(strip \

		$(LOCAL_PATH)/$(dir): \

	    $(patsubst ./%,%,$(shell cd $(LOCAL_PATH)/$(dir) && \

	    $(patsubst ./%,%,$(sort $(shell cd $(LOCAL_PATH)/$(dir) && \

		find . \

		    -type d -a -name ".svn" -prune -o \

		    -type f \
@@ -66,7 +66,7 @@ ifneq ($(LOCAL_JAVA_RESOURCE_DIRS),) 
			-a \! -name ".DS_Store" \

			-a \! -name "*~" \

			-print \

		    )) \

		    ))) \

	)) \

    )

  java_resource_file_groups := $(filter-out %:,$(java_resource_file_groups))

core/pdk_config.mk

+5 −5
Original line number Diff line number Diff line
@@ -21,11 +21,11 @@ ifndef PDK_FUSION_PLATFORM_ZIP 
# Most PDK project paths should be using vendor/pdk/TARGET_DEVICE

# but some legacy ones (e.g. mini_armv7a_neon generic PDK) were setup

# with vendor/pdk/TARGET_PRODUCT.

_pdk_fusion_default_platform_zip = $(wildcard \

vendor/pdk/$(TARGET_DEVICE)/$(TARGET_PRODUCT)-$(TARGET_BUILD_VARIANT)/platform/platform.zip \

vendor/pdk/$(TARGET_DEVICE)/$(patsubst aosp_%,full_%,$(TARGET_PRODUCT))-$(TARGET_BUILD_VARIANT)/platform/platform.zip \

vendor/pdk/$(TARGET_PRODUCT)/$(TARGET_PRODUCT)-$(TARGET_BUILD_VARIANT)/platform/platform.zip \

vendor/pdk/$(TARGET_PRODUCT)/$(patsubst aosp_%,full_%,$(TARGET_PRODUCT))-$(TARGET_BUILD_VARIANT)/platform/platform.zip)

_pdk_fusion_default_platform_zip = $(strip \

  $(wildcard vendor/pdk/$(TARGET_DEVICE)/$(TARGET_PRODUCT)-$(TARGET_BUILD_VARIANT)/platform/platform.zip) \

  $(wildcard vendor/pdk/$(TARGET_DEVICE)/$(patsubst aosp_%,full_%,$(TARGET_PRODUCT))-$(TARGET_BUILD_VARIANT)/platform/platform.zip) \

  $(wildcard vendor/pdk/$(TARGET_PRODUCT)/$(TARGET_PRODUCT)-$(TARGET_BUILD_VARIANT)/platform/platform.zip) \

  $(wildcard vendor/pdk/$(TARGET_PRODUCT)/$(patsubst aosp_%,full_%,$(TARGET_PRODUCT))-$(TARGET_BUILD_VARIANT)/platform/platform.zip))

ifneq (,$(_pdk_fusion_default_platform_zip))

PDK_FUSION_PLATFORM_ZIP := $(word 1, $(_pdk_fusion_default_platform_zip))

TARGET_BUILD_PDK := true