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

Commit ac8d6757 authored by Nicolas Geoffray's avatar Nicolas Geoffray Committed by Gerrit Code Review
Browse files

Merge "Use the jars, not the classes.dex for passing to hiddenapi."

parents 6f62f79d e5b368bf

core/dex_preopt.mk

+1 −3
Original line number Diff line number Diff line
@@ -76,9 +76,7 @@ $(INTERNAL_PLATFORM_HIDDENAPI_STUB_FLAGS): PRIVATE_HIDDENAPI_STUBS_CORE_PLATFORM 
$(INTERNAL_PLATFORM_HIDDENAPI_STUB_FLAGS): $(HIDDENAPI) $(HIDDENAPI_STUBS) \

                                           $(HIDDENAPI_STUBS_SYSTEM) $(HIDDENAPI_STUBS_TEST) \

                                           $(HIDDENAPI_STUBS_CORE_PLATFORM)

	for INPUT_DEX in $(PRIVATE_DEX_INPUTS); do \

		find `dirname $${INPUT_DEX}` -maxdepth 1 -name "classes*.dex"; \

	done | sort | sed 's/^/--boot-dex=/' | xargs $(HIDDENAPI) list \

	$(HIDDENAPI) list $(addprefix --boot-dex=,$(PRIVATE_DEX_INPUTS)) \

	    --public-stub-classpath=$(call normalize-path-list, $(PRIVATE_HIDDENAPI_STUBS)) \

	    --public-stub-classpath=$(call normalize-path-list, $(PRIVATE_HIDDENAPI_STUBS_SYSTEM)) \

	    --public-stub-classpath=$(call normalize-path-list, $(PRIVATE_HIDDENAPI_STUBS_TEST)) \