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

Commit e9540386 authored by David Brazdil's avatar David Brazdil
Browse files

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 5381eb68.

Test: m
Change-Id: I8d37935c5ea381348278ec668d474f6ffb8e8411
parent 5381eb68

core/definitions.mk

+4 −3
Original line number Original line Diff line number Diff line
@@ -2672,9 +2672,10 @@ $(2): $(1) $(HIDDENAPI) $(INTERNAL_PLATFORM_HIDDENAPI_LIGHT_GREYLIST) \ 
      $(INTERNAL_PLATFORM_HIDDENAPI_DARK_GREYLIST) $(INTERNAL_PLATFORM_HIDDENAPI_BLACKLIST)

      $(INTERNAL_PLATFORM_HIDDENAPI_DARK_GREYLIST) $(INTERNAL_PLATFORM_HIDDENAPI_BLACKLIST)

	@rm -rf $(dir $(2))

	@rm -rf $(dir $(2))

	@mkdir -p $(dir $(2))

	@mkdir -p $(dir $(2))

	find $(dir $(1)) -maxdepth 1 -name "classes*.dex" | xargs -I{} cp -f {} $(dir $(2))/; \

	for INPUT_DEX in `find $(dir $(1)) -maxdepth 1 -name "classes*.dex" | sort`; do \

	find $(dir $(2)) -maxdepth 1 -name "classes*.dex" | sort | sed 's/^/--dex=/' \

	    echo "--input-dex=$$$${INPUT_DEX}"; \

	| xargs $(HIDDENAPI) encode \

	    echo "--output-dex=$(dir $(2))/`basename $$$${INPUT_DEX}`"; \

	done | xargs $(HIDDENAPI) encode \

	    --light-greylist=$(INTERNAL_PLATFORM_HIDDENAPI_LIGHT_GREYLIST) \

	    --light-greylist=$(INTERNAL_PLATFORM_HIDDENAPI_LIGHT_GREYLIST) \

	    --dark-greylist=$(INTERNAL_PLATFORM_HIDDENAPI_DARK_GREYLIST) \

	    --dark-greylist=$(INTERNAL_PLATFORM_HIDDENAPI_DARK_GREYLIST) \

	    --blacklist=$(INTERNAL_PLATFORM_HIDDENAPI_BLACKLIST)

	    --blacklist=$(INTERNAL_PLATFORM_HIDDENAPI_BLACKLIST)