StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Replace $(shell find | sort) with $(sort $(shell find))"

Browse Source 
This reverts commit be0b6cee4f.

Reason for revert: b/73143444

Change-Id: I51800646b816d639b40ee1f012b1bf225c04e0b6
(cherry picked from commit 586c8821083ad1bec874d6de5ab378dbb47dee58)
This commit is contained in:
Tao Bao
2018-02-10 03:04:12 +00:00
parent f8255b496b
commit 14a3217ff9
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/Makefile
View File

@@ -2367,18 +2367,18 @@ OTATOOLS_DEPS := \
system/extras/verity/build_verity_metadata.py \ system/extras/verity/build_verity_metadata.py \
system/extras/ext4_utils/mke2fs.conf \ system/extras/ext4_utils/mke2fs.conf \
external/avb/test/data/testkey_rsa4096.pem \ external/avb/test/data/testkey_rsa4096.pem \
$(sort $(shell find system/update_engine/scripts -name \*.pyc -prune -o -type f -print)) \ $(shell find system/update_engine/scripts -name \*.pyc -prune -o -type f -print | sort) \
$(sort $(shell find build/target/product/security -type f -name \*.x509.pem -o -name \*.pk8 -o \ $(shell find build/target/product/security -type f -name \*.x509.pem -o -name \*.pk8 -o \
-name verity_key)) \ -name verity_key | sort) \
$(sort $(shell find device $(wildcard vendor) -type f -name \*.pk8 -o -name verifiedboot\* -o \ $(shell find device $(wildcard vendor) -type f -name \*.pk8 -o -name verifiedboot\* -o \
-name \*.x509.pem -o -name oem\*.prop)) -name \*.x509.pem -o -name oem\*.prop | sort)
OTATOOLS_RELEASETOOLS := \ OTATOOLS_RELEASETOOLS := \
$(sort $(shell find build/make/tools/releasetools -name \*.pyc -prune -o -type f)) $(shell find build/make/tools/releasetools -name \*.pyc -prune -o -type f | sort)
ifeq (true,$(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SUPPORTS_VBOOT)) ifeq (true,$(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SUPPORTS_VBOOT))
OTATOOLS_DEPS += \ OTATOOLS_DEPS += \
$(sort $(shell find external/vboot_reference/tests/devkeys -type f)) $(shell find external/vboot_reference/tests/devkeys -type f | sort)
endif endif
$(BUILT_OTATOOLS_PACKAGE): $(OTATOOLS) $(OTATOOLS_DEPS) $(OTATOOLS_RELEASETOOLS) | $(ACP) $(BUILT_OTATOOLS_PACKAGE): $(OTATOOLS) $(OTATOOLS_DEPS) $(OTATOOLS_RELEASETOOLS) | $(ACP)

2
core/aux_config.mk
View File

@@ -154,7 +154,7 @@ os_sfx :=_aux_os_config.mk
config_roots := $(wildcard device vendor) config_roots := $(wildcard device vendor)
all_configs := all_configs :=
ifdef config_roots ifdef config_roots
all_configs := $(sort $(shell find $(config_roots) -maxdepth 4 -name '*$(variant_sfx)' -o -name '*$(os_sfx)')) all_configs := $(shell find $(config_roots) -maxdepth 4 -name '*$(variant_sfx)' -o -name '*$(os_sfx)' | sort)
endif endif
all_os_configs := $(filter %$(os_sfx),$(all_configs)) all_os_configs := $(filter %$(os_sfx),$(all_configs))
all_variant_configs := $(filter %$(variant_sfx),$(all_configs)) all_variant_configs := $(filter %$(variant_sfx),$(all_configs))