Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 57b1e546 authored by David Brazdil's avatar David Brazdil
Browse files

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
parent 645b8db0

core/definitions.mk

+8 −6
Original line number Diff line number Diff line
@@ -2843,7 +2843,8 @@ $(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) \

		xargs $(HIDDENAPI) encode \

		    --light-greylist=$(INTERNAL_PLATFORM_HIDDENAPI_LIGHT_GREYLIST) \

		    --dark-greylist=$(INTERNAL_PLATFORM_HIDDENAPI_DARK_GREYLIST) \

		    --blacklist=$(INTERNAL_PLATFORM_HIDDENAPI_BLACKLIST)

endef
@@ -2858,7 +2859,8 @@ $(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) \

		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}