From d719f5131ad63f644b98f25e634ac9f282f808ef Mon Sep 17 00:00:00 2001 From: David Brazdil Date: Tue, 13 Nov 2018 16:48:23 +0000 Subject: Rename hiddenapi config files Rename files to reflect new API list naming convention: light-greylist => greylist max-sdk-p-blacklist => greylist-max-p This also removes unused files (private-dex.txt, public-dex.txt, removed-dex.txt) and merges vendor.txt into greylist.txt. Test: m appcompat Test: frameworks/base/tools/hiddenapi/generate_hiddenapi_lists_test.py Merged-In: I4922ecb011a03bef3fa105f8181d1851d2cc496a Change-Id: I4922ecb011a03bef3fa105f8181d1851d2cc496a --- Android.mk | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'Android.mk') diff --git a/Android.mk b/Android.mk index b7dda9a45ed8..92e33e988249 100644 --- a/Android.mk +++ b/Android.mk @@ -76,10 +76,9 @@ $(OUT_DOCS)/offline-sdk-timestamp: $(OUT_DOCS)/offline-sdk-docs-docs.zip .KATI_RESTAT: $(INTERNAL_PLATFORM_HIDDENAPI_FLAGS) $(INTERNAL_PLATFORM_HIDDENAPI_FLAGS): \ frameworks/base/tools/hiddenapi/generate_hiddenapi_lists.py \ - frameworks/base/config/hiddenapi-light-greylist.txt \ - frameworks/base/config/hiddenapi-vendor-list.txt \ + frameworks/base/config/hiddenapi-greylist.txt \ + frameworks/base/config/hiddenapi-greylist-max-p.txt \ frameworks/base/config/hiddenapi-greylist-max-o.txt \ - frameworks/base/config/hiddenapi-max-sdk-p-blacklist.txt \ frameworks/base/config/hiddenapi-force-blacklist.txt \ $(INTERNAL_PLATFORM_HIDDENAPI_PUBLIC_LIST) \ $(INTERNAL_PLATFORM_HIDDENAPI_PRIVATE_LIST) \ @@ -88,10 +87,9 @@ $(INTERNAL_PLATFORM_HIDDENAPI_FLAGS): \ --public $(INTERNAL_PLATFORM_HIDDENAPI_PUBLIC_LIST) \ --private $(INTERNAL_PLATFORM_HIDDENAPI_PRIVATE_LIST) \ --csv $(PRIVATE_FLAGS_INPUTS) \ - --greylist \ - frameworks/base/config/hiddenapi-light-greylist.txt \ - frameworks/base/config/hiddenapi-vendor-list.txt \ + --greylist frameworks/base/config/hiddenapi-greylist.txt \ --greylist-ignore-conflicts $(INTERNAL_PLATFORM_REMOVED_DEX_API_FILE) \ + --greylist-max-p frameworks/base/config/hiddenapi-greylist-max-p.txt \ --greylist-max-o-ignore-conflicts \ frameworks/base/config/hiddenapi-greylist-max-o.txt \ --blacklist frameworks/base/config/hiddenapi-force-blacklist.txt \ -- cgit v1.2.3