From e9540386e2ccef6a01b7ee76f7df080a378d57ac Mon Sep 17 00:00:00 2001 From: David Brazdil Date: Thu, 25 Oct 2018 17:25:09 +0000 Subject: [PATCH] Revert^2: Change command-line flags of hiddenapi Change command-line flags of hiddenapi The `hiddenapi` build tool now reads a dex file from one filename and writes a modified dex file to another. Change the build rule to reflect it. This reverts commit 5381eb684e602a3a394e4fe9af9fd2270ad01e2f. Test: m Change-Id: I8d37935c5ea381348278ec668d474f6ffb8e8411 --- core/definitions.mk | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/core/definitions.mk b/core/definitions.mk index baa2342f3d..b00ab6ff91 100644 --- a/core/definitions.mk +++ b/core/definitions.mk @@ -2672,9 +2672,10 @@ $(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)) - 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 \ + 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 \ --light-greylist=$(INTERNAL_PLATFORM_HIDDENAPI_LIGHT_GREYLIST) \ --dark-greylist=$(INTERNAL_PLATFORM_HIDDENAPI_DARK_GREYLIST) \ --blacklist=$(INTERNAL_PLATFORM_HIDDENAPI_BLACKLIST)