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

Commit d9a9e981 authored by David Brazdil's avatar David Brazdil Committed by android-build-merger
Browse files

Merge "Adjust arguments of `hiddenapi` tool" 

am: dadcb9ce

Change-Id: I952877c22a547aacbe248e2411f5b2628a164133
parents 267e989b dadcb9ce

core/definitions.mk

+8 −6
Original line number Diff line number Diff line
@@ -2844,7 +2844,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
@@ -2859,7 +2860,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}