From 6b00bfd2fb9b012d856d26441e60dcb84c64ef40 Mon Sep 17 00:00:00 2001 From: David Brazdil Date: Tue, 18 Sep 2018 06:11:30 +0100 Subject: [PATCH] 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. Test: m Change-Id: I2c4b080dbfdf348f230e7544c228cfd7419d1c64 --- core/definitions.mk | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/core/definitions.mk b/core/definitions.mk index fd55fe6a8..97b6bc561 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)