From 5381eb684e602a3a394e4fe9af9fd2270ad01e2f Mon Sep 17 00:00:00 2001 From: David Brazdil Date: Wed, 24 Oct 2018 12:34:22 +0000 Subject: [PATCH] Revert "Change command-line flags of hiddenapi" This reverts commit 6b00bfd2fb9b012d856d26441e60dcb84c64ef40. Reason for revert: marlin running out of space Exempted-From-Owner-Approval: Needed to unblock build, no buildcops on call in EMEA today. Change-Id: I9e86545c8ada2523bc21116c6e958f69fb94dc26 --- core/definitions.mk | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/core/definitions.mk b/core/definitions.mk index b00ab6ff91..baa2342f3d 100644 --- a/core/definitions.mk +++ b/core/definitions.mk @@ -2672,10 +2672,9 @@ $(2): $(1) $(HIDDENAPI) $(INTERNAL_PLATFORM_HIDDENAPI_LIGHT_GREYLIST) \ $(INTERNAL_PLATFORM_HIDDENAPI_DARK_GREYLIST) $(INTERNAL_PLATFORM_HIDDENAPI_BLACKLIST) @rm -rf $(dir $(2)) @mkdir -p $(dir $(2)) - for INPUT_DEX in `find $(dir $(1)) -maxdepth 1 -name "classes*.dex" | sort`; do \ - echo "--input-dex=$$$${INPUT_DEX}"; \ - echo "--output-dex=$(dir $(2))/`basename $$$${INPUT_DEX}`"; \ - done | xargs $(HIDDENAPI) encode \ + find $(dir $(1)) -maxdepth 1 -name "classes*.dex" | xargs -I{} cp -f {} $(dir $(2))/; \ + find $(dir $(2)) -maxdepth 1 -name "classes*.dex" | sort | sed 's/^/--dex=/' \ + | xargs $(HIDDENAPI) encode \ --light-greylist=$(INTERNAL_PLATFORM_HIDDENAPI_LIGHT_GREYLIST) \ --dark-greylist=$(INTERNAL_PLATFORM_HIDDENAPI_DARK_GREYLIST) \ --blacklist=$(INTERNAL_PLATFORM_HIDDENAPI_BLACKLIST)