From 5e37d22671cc6d9962b4a52deb73118064fd187d Mon Sep 17 00:00:00 2001 From: Mathew Inwood Date: Fri, 7 Sep 2018 14:30:24 +0100 Subject: Include dark greylist entries from annotations. @UnsupportedAppUsage annotations support setting a maxTargetSdk property on the which results in the member being placed on the dark grey list, or in future on a P or Q blacklist. Bug: 114361293 Test: m Change-Id: I33be28f8afb034a030bdf5cf29d43ba72f50bfcd --- Android.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'Android.mk') diff --git a/Android.mk b/Android.mk index abfdb8bef0cd..e43243b94d99 100644 --- a/Android.mk +++ b/Android.mk @@ -351,7 +351,9 @@ $(INTERNAL_PLATFORM_HIDDENAPI_WHITELIST): \ <(comm -12 <(sort $(INTERNAL_PLATFORM_REMOVED_DEX_API_FILE)) \ $(INTERNAL_PLATFORM_HIDDENAPI_PRIVATE_LIST)) \ $(PRIVATE_GREYLIST_INPUTS) \ - --input-dark-greylists frameworks/base/config/hiddenapi-dark-greylist.txt \ + --input-dark-greylists \ + frameworks/base/config/hiddenapi-dark-greylist.txt \ + $(PRIVATE_DARKGREYLIST_INPUTS) \ --input-blacklists frameworks/base/config/hiddenapi-force-blacklist.txt \ --output-whitelist $(INTERNAL_PLATFORM_HIDDENAPI_WHITELIST).tmp \ --output-light-greylist $(INTERNAL_PLATFORM_HIDDENAPI_LIGHT_GREYLIST).tmp \ -- cgit v1.2.3