commit 873d1d30d540589b7b50948200c5f6ef2b5a845d
author David Brazdil <dbrazdil@google.com> Tue Mar 13 09:41:23 2018 +0000
committer David Brazdil <dbrazdil@google.com> Fri Mar 16 10:23:09 2018 +0000
tree 4ff2ba93b88f21c87abf8dd642001af521b54dd0
parent 78e4f84f045d2452f59c6ebea81493bd9894aa1b

Add uses of hidden APIs from vendor apps

These will move into the dark greylist once we remove the UI toast.
Merge them with light greylist for now.

Bug: 64382372
Bug: 74589747
Bug: 74588266
Bug: 74586173
Bug: 74586969
Test: make
Change-Id: I8c1d3b67b763e8b14a66874705ba7165cf421e72
Merged-In: I5d0ec308a0187d67df6d9a4f0778c9285dc1e2af

Android.mk

diff --git a/Android.mk b/Android.mk
index bbe2faf..e2f88e8 100644
--- a/Android.mk
+++ b/Android.mk
@@ -868,8 +868,12 @@
 
 $(eval $(call copy-one-file,frameworks/base/config/hiddenapi-blacklist.txt,\
                             $(INTERNAL_PLATFORM_HIDDENAPI_BLACKLIST)))
-$(eval $(call copy-one-file,frameworks/base/config/hiddenapi-light-greylist.txt,\
-                            $(INTERNAL_PLATFORM_HIDDENAPI_LIGHT_GREYLIST)))
+
+# Temporarily merge light greylist from two files. Vendor list will become dark
+# grey once we remove the UI toast.
+$(INTERNAL_PLATFORM_HIDDENAPI_LIGHT_GREYLIST): frameworks/base/config/hiddenapi-light-greylist.txt \
+                                               frameworks/base/config/hiddenapi-vendor-list.txt
+	sort $^ > $@
 
 # Generate dark greylist as private API minus (blacklist plus light greylist).