commit 14a3217ff928c21ffeceec4ec187332fcaf9f8f4
author Tao Bao <tbao@google.com> Sat Feb 10 03:04:12 2018 +0000
committer Tao Bao <tbao@google.com> Fri Feb 09 19:05:19 2018 -0800
tree 8f77b600fd5027d25c660db6d524e559e15e2a36
parent f8255b496ba12b3bc03d59794b278c779b421f02

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

This reverts commit be0b6cee4f17b36962378d064aa3e712e49e98fe.

Reason for revert: b/73143444

Change-Id: I51800646b816d639b40ee1f012b1bf225c04e0b6
(cherry picked from commit 586c8821083ad1bec874d6de5ab378dbb47dee58)

core/Makefile

diff --git a/core/Makefile b/core/Makefile
index 5b87e80..a67a411 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -2367,18 +2367,18 @@
   system/extras/verity/build_verity_metadata.py \
   system/extras/ext4_utils/mke2fs.conf \
   external/avb/test/data/testkey_rsa4096.pem \
-  $(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))
+  $(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)
 
 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))
 OTATOOLS_DEPS += \
-  $(sort $(shell find external/vboot_reference/tests/devkeys -type f))
+  $(shell find external/vboot_reference/tests/devkeys -type f | sort)
 endif
 
 $(BUILT_OTATOOLS_PACKAGE): $(OTATOOLS) $(OTATOOLS_DEPS) $(OTATOOLS_RELEASETOOLS) | $(ACP)

core/aux_config.mk

diff --git a/core/aux_config.mk b/core/aux_config.mk
index 6a5cd63..bdae86a 100644
--- a/core/aux_config.mk
+++ b/core/aux_config.mk
@@ -154,7 +154,7 @@
 config_roots := $(wildcard device vendor)
 all_configs :=
 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
 all_os_configs := $(filter %$(os_sfx),$(all_configs))
 all_variant_configs := $(filter %$(variant_sfx),$(all_configs))