From 57b1e546a046775fe39091820b363211038eccf9 Mon Sep 17 00:00:00 2001 From: David Brazdil Date: Wed, 27 Jun 2018 13:24:32 +0100 Subject: [PATCH] Adjust arguments of `hiddenapi` tool The `hiddenapi` build tool now expects the first argument to be a command name. Change its build rule accordingly. Bug: 79409988 Test: make Change-Id: I7e34331c487f490d1de6a10c4139768e9774f03e --- core/definitions.mk | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/core/definitions.mk b/core/definitions.mk index fab5e42aaa..9dd7699c2c 100644 --- a/core/definitions.mk +++ b/core/definitions.mk @@ -2843,9 +2843,10 @@ $(2): $(1) $(HIDDENAPI) $(INTERNAL_PLATFORM_HIDDENAPI_LIGHT_GREYLIST) \ find $(dir $(1)) -maxdepth 1 -name "classes*.dex" | sort | \ xargs -I{} cp -f {} $(dir $(2)) find $(dir $(2)) -name "classes*.dex" | sort | sed 's/^/--dex=/' | \ - xargs $(HIDDENAPI) --light-greylist=$(INTERNAL_PLATFORM_HIDDENAPI_LIGHT_GREYLIST) \ - --dark-greylist=$(INTERNAL_PLATFORM_HIDDENAPI_DARK_GREYLIST) \ - --blacklist=$(INTERNAL_PLATFORM_HIDDENAPI_BLACKLIST) + xargs $(HIDDENAPI) encode \ + --light-greylist=$(INTERNAL_PLATFORM_HIDDENAPI_LIGHT_GREYLIST) \ + --dark-greylist=$(INTERNAL_PLATFORM_HIDDENAPI_DARK_GREYLIST) \ + --blacklist=$(INTERNAL_PLATFORM_HIDDENAPI_BLACKLIST) endef define hiddenapi-copy-soong-jar @@ -2858,9 +2859,10 @@ $(2): $(1) $(HIDDENAPI) $(SOONG_ZIP) $(MERGE_ZIPS) $(INTERNAL_PLATFORM_HIDDENAPI @mkdir -p $${PRIVATE_FOLDER} unzip -q $(2) 'classes*.dex' -d $${PRIVATE_FOLDER} find $${PRIVATE_FOLDER} -name "classes*.dex" | sort | sed 's/^/--dex=/' | \ - xargs $(HIDDENAPI) --light-greylist=$(INTERNAL_PLATFORM_HIDDENAPI_LIGHT_GREYLIST) \ - --dark-greylist=$(INTERNAL_PLATFORM_HIDDENAPI_DARK_GREYLIST) \ - --blacklist=$(INTERNAL_PLATFORM_HIDDENAPI_BLACKLIST) + xargs $(HIDDENAPI) encode \ + --light-greylist=$(INTERNAL_PLATFORM_HIDDENAPI_LIGHT_GREYLIST) \ + --dark-greylist=$(INTERNAL_PLATFORM_HIDDENAPI_DARK_GREYLIST) \ + --blacklist=$(INTERNAL_PLATFORM_HIDDENAPI_BLACKLIST) $(SOONG_ZIP) -o $${PRIVATE_FOLDER}/classes.dex.jar -C $${PRIVATE_FOLDER} -D $${PRIVATE_FOLDER} $(MERGE_ZIPS) -D -zipToNotStrip $${PRIVATE_FOLDER}/classes.dex.jar -stripFile "classes*.dex" \ $(2) $${PRIVATE_FOLDER}/classes.dex.jar $(1)