From 9f46a30e292d7bac5cc4ebae72ca1ada5651c5f6 Mon Sep 17 00:00:00 2001 From: Mathew Inwood Date: Wed, 8 Aug 2018 14:20:19 +0100 Subject: [PATCH] Pass public API list to class2greylist tool. This is necessary to allow it to exclude synthetic bridge methods from the generated greylist. We need to be able to apply the @UnsupportedAppUsage annotation to regular (non-bridged) methods, but due to the SDK visibility rules, the synthetic bridge is part of the SDK. Bug: 110868826 Test: m Change-Id: Iac23b0d2a9b371771a020b24191634a8b6b9b4b5 --- core/definitions.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/definitions.mk b/core/definitions.mk index 291441b22..35bf1ecdb 100644 --- a/core/definitions.mk +++ b/core/definitions.mk @@ -2875,8 +2875,8 @@ endef # Generate a greylist.txt from a classes.jar define hiddenapi-generate-greylist-txt -$(2): $(1) $(CLASS2GREYLIST) - $(CLASS2GREYLIST) $(1) > $(2) +$(2): $(1) $(CLASS2GREYLIST) $(INTERNAL_PLATFORM_HIDDENAPI_PUBLIC_LIST) + $(CLASS2GREYLIST) --public-api-list $(INTERNAL_PLATFORM_HIDDENAPI_PUBLIC_LIST) $(1) > $(2) $(INTERNAL_PLATFORM_HIDDENAPI_LIGHT_GREYLIST): $(2) $(INTERNAL_PLATFORM_HIDDENAPI_LIGHT_GREYLIST): \