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

Commit b5ab2c78 authored by Dan Willemsen's avatar Dan Willemsen Committed by Android (Google) Code Review
Browse files

Merge "Revert^2 "Replace $(shell find | sort) with $(sort $(shell find))""

parents a350b67e 5232f099

core/Makefile

+7 −7
Original line number Diff line number Diff line
@@ -2371,18 +2371,18 @@ OTATOOLS_DEPS := \ 
  system/extras/verity/build_verity_metadata.py \

  system/extras/ext4_utils/mke2fs.conf \

  external/avb/test/data/testkey_rsa4096.pem \

  $(shell find system/update_engine/scripts -name \*.pyc -prune -o -type f -print | sort) \

  $(shell find build/target/product/security -type f -name \*.x509.pem -o -name \*.pk8 -o \

      -name verity_key | sort) \

  $(shell find device $(wildcard vendor) -type f -name \*.pk8 -o -name verifiedboot\* -o \

      -name \*.x509.pem -o -name oem\*.prop | sort)

  $(sort $(shell find system/update_engine/scripts -name \*.pyc -prune -o -type f -print)) \

  $(sort $(shell find build/target/product/security -type f -name \*.x509.pem -o -name \*.pk8 -o \

      -name verity_key)) \

  $(sort $(shell find device $(wildcard vendor) -type f -name \*.pk8 -o -name verifiedboot\* -o \

      -name \*.x509.pem -o -name oem\*.prop))



OTATOOLS_RELEASETOOLS := \

  $(shell find build/make/tools/releasetools -name \*.pyc -prune -o -type f | sort)

  $(sort $(shell find build/make/tools/releasetools -name \*.pyc -prune -o -type f))



ifeq (true,$(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SUPPORTS_VBOOT))

OTATOOLS_DEPS += \

  $(shell find external/vboot_reference/tests/devkeys -type f | sort)

  $(sort $(shell find external/vboot_reference/tests/devkeys -type f))

endif



$(BUILT_OTATOOLS_PACKAGE): $(OTATOOLS) $(OTATOOLS_DEPS) $(OTATOOLS_RELEASETOOLS) | $(ACP)

core/aux_config.mk

+1 −1
Original line number Diff line number Diff line
@@ -154,7 +154,7 @@ os_sfx :=_aux_os_config.mk 
config_roots := $(wildcard device vendor)

all_configs :=

ifdef config_roots

all_configs := $(shell find $(config_roots) -maxdepth 4 -name '*$(variant_sfx)' -o -name '*$(os_sfx)' | sort)

all_configs := $(sort $(shell find $(config_roots) -maxdepth 4 -name '*$(variant_sfx)' -o -name '*$(os_sfx)'))

endif

all_os_configs := $(filter %$(os_sfx),$(all_configs))

all_variant_configs := $(filter %$(variant_sfx),$(all_configs))