diff --git a/api/StubLibraries.bp b/api/StubLibraries.bp
index ba11ded..f2fe205 100644
--- a/api/StubLibraries.bp
+++ b/api/StubLibraries.bp
@@ -63,6 +63,7 @@
             tag: ".removed-api.txt",
         },
     ],
+    api_surface: "public",
 }
 
 priv_apps = " --show-annotation android.annotation.SystemApi\\(" +
@@ -116,6 +117,7 @@
             tag: ".removed-api.txt",
         },
     ],
+    api_surface: "system",
 }
 
 droidstubs {
@@ -161,6 +163,7 @@
             tag: ".removed-api.txt",
         },
     ],
+    api_surface: "test",
 }
 
 droidstubs {
@@ -200,6 +203,7 @@
             tag: ".removed-api.txt",
         },
     ],
+    api_surface: "module-lib",
 }
 
 /////////////////////////////////////////////////////////////////////