diff options
| author | David Brazdil <dbrazdil@google.com> | 2018-09-11 11:09:01 +0100 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2018-09-11 18:19:22 +0000 |
| commit | bf740d532bcb2c12f840fb1f2e4b44d39a13b339 (patch) | |
| tree | 08af9501bcee9a4413c9c3a23fcd3609dd534144 /Android.mk | |
| parent | 196b79d58be4836986548d397d3b9447414ce7e3 (diff) | |
Revert "Check in P dark greylist, use it for hidden API list generation"
This reverts commit 3cc74c71ef907a76547424aea6597f7b2907e9fb.
We saw app crashes due stricter classification of non-SDK APIs.
Bug: 115284625
Bug: 113881436
Test: phone boots
Change-Id: I689d0fbf66fabeffa5032e13f2f1f314c50b6cc5
(cherry picked from commit 4a55eebf26a5366de302578f76947e7c05305a22)
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/Android.mk b/Android.mk index e43243b94d99..5c4c2376f80e 100644 --- a/Android.mk +++ b/Android.mk @@ -336,7 +336,6 @@ $(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) \ @@ -345,15 +344,12 @@ $(INTERNAL_PLATFORM_HIDDENAPI_WHITELIST): \ --input-public $(INTERNAL_PLATFORM_HIDDENAPI_PUBLIC_LIST) \ --input-private $(INTERNAL_PLATFORM_HIDDENAPI_PRIVATE_LIST) \ --input-whitelists $(PRIVATE_WHITELIST_INPUTS) \ - --input-light-greylists \ + --input-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 \ - $(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 \ |