diff options
| author | David Brazdil <dbrazdil@google.com> | 2018-09-06 11:02:06 +0100 |
|---|---|---|
| committer | David Brazdil <dbrazdil@google.com> | 2018-09-06 11:10:51 +0100 |
| commit | 3cc74c71ef907a76547424aea6597f7b2907e9fb (patch) | |
| tree | 3b698fdf89b4a5abeed7a2b08aa2f6455fc20bd1 /Android.mk | |
| parent | 08d7a208e8c8b6e23d7949d5ce9bc06cb5bea538 (diff) | |
Check in P dark greylist, use it for hidden API list generation
We want to preserve the same semantics as P wrt dark greylist. This will
eventually become the "blacklist for target SDK >= P".
Bug: 113881436
Test: phone boots
Change-Id: I3bb72102e1d054eb0f2cae089ab633a0bc2bb276
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Android.mk b/Android.mk index 988c009bdbac..47e861ac754c 100644 --- a/Android.mk +++ b/Android.mk @@ -331,6 +331,7 @@ $(INTERNAL_PLATFORM_HIDDENAPI_WHITELIST): \ 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-dark-greylist.txt \ frameworks/base/config/hiddenapi-force-blacklist.txt \ $(INTERNAL_PLATFORM_HIDDENAPI_PUBLIC_LIST) \ $(INTERNAL_PLATFORM_HIDDENAPI_PRIVATE_LIST) \ @@ -339,12 +340,13 @@ $(INTERNAL_PLATFORM_HIDDENAPI_WHITELIST): \ --input-public $(INTERNAL_PLATFORM_HIDDENAPI_PUBLIC_LIST) \ --input-private $(INTERNAL_PLATFORM_HIDDENAPI_PRIVATE_LIST) \ --input-whitelists $(PRIVATE_WHITELIST_INPUTS) \ - --input-greylists \ + --input-light-greylists \ frameworks/base/config/hiddenapi-light-greylist.txt \ frameworks/base/config/hiddenapi-vendor-list.txt \ <(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-blacklists frameworks/base/config/hiddenapi-force-blacklist.txt \ --output-whitelist $(INTERNAL_PLATFORM_HIDDENAPI_WHITELIST) \ --output-light-greylist $(INTERNAL_PLATFORM_HIDDENAPI_LIGHT_GREYLIST) \ |