commit 41ccbfb4224cdc58f47c9f39f009588ac6d94b02
author Makoto Onuki <omakoto@google.com> Fri Jul 10 12:05:21 2020 -0700
committer Makoto Onuki <omakoto@google.com> Tue Jul 14 17:46:10 2020 +0000
tree fbc174a9da1423360962b33cedb836cb990e0d51
parent 4e7be87fbd169baf01ce8e63a57635870e909d93

Proper API hierarchy between MODULE_LIBS and PRIV_APPS system APIs

Test: build / treehugger
Bug: 146727827
Change-Id: Ie1ad6711c490c679ebcfacd97154380a8810ba1c

StubLibraries.bp

diff --git a/StubLibraries.bp b/StubLibraries.bp
index 56c5688..decbb85 100644
--- a/StubLibraries.bp
+++ b/StubLibraries.bp
@@ -155,6 +155,9 @@
 module_libs = " " +
     " --show-annotation android.annotation.SystemApi\\(" +
         "client=android.annotation.SystemApi.Client.MODULE_LIBRARIES" +
+    "\\)" +
+    " --show-for-stub-purposes-annotation android.annotation.SystemApi\\(" +
+        "client=android.annotation.SystemApi.Client.PRIVILEGED_APPS" +
     "\\) "
 
 droidstubs {
@@ -232,9 +235,8 @@
 }
 
 /////////////////////////////////////////////////////////////////////
-// Following droidstubs modules are for extra APIs for modules.
-// The framework currently have two more API surfaces for modules:
-// @SystemApi(client=MODULE_APPS) and @SystemApi(client=MODULE_LIBRARIES)
+// Following droidstubs modules are for extra APIs for modules,
+// namely @SystemApi(client=MODULE_LIBRARIES) APIs.
 /////////////////////////////////////////////////////////////////////
 
 // TODO(b/146727827) remove the *-api module when we can teach metalava