commit 6e69e4458755636707205be53b6bddd335e11637
author Andrei Onea <andreionea@google.com> Wed Feb 10 20:53:12 2021 +0000
committer Andrei-Valentin Onea <andreionea@google.com> Fri Feb 19 18:50:07 2021 +0000
tree e2f14567cc040c42e56d30a8ff30ed34051244f3
parent 708c77d236537a8d6afb447d99789f547eec9a31

Create non updatable system server stubs

Separate out stubs from non-updatable part of the system server. The
ultimate goal is to create system server stubs by merging the
non-updatable stubs and the per-module stubs, instead of generating them
from the combined sources.

Bug: 177640454
Test: m checkapi

Change-Id: Iecb9d51472ae238bbeabe65e1cd782b7c8a4ce59
Merged-In: Iecb9d51472ae238bbeabe65e1cd782b7c8a4ce59

services/Android.bp

diff --git a/services/Android.bp b/services/Android.bp
index a13dbe6..dfc8711 100644
--- a/services/Android.bp
+++ b/services/Android.bp
@@ -13,7 +13,7 @@
 }
 
 filegroup {
-    name: "services-all-sources",
+    name: "services-non-updatable-sources",
     srcs: [
         ":services.core-sources",
         ":services.accessibility-sources",
@@ -38,6 +38,14 @@
         ":services.usb-sources",
         ":services.voiceinteraction-sources",
         ":services.wifi-sources",
+    ],
+    visibility: ["//visibility:private"],
+}
+
+filegroup {
+    name: "services-all-sources",
+    srcs: [
+        ":services-non-updatable-sources",
         ":service-permission-sources",
         ":service-statsd-sources",
     ],
@@ -118,9 +126,8 @@
 // API stub
 // =============================================================
 
-droidstubs {
-    name: "services-stubs.sources",
-    srcs: [":services-all-sources"],
+stubs_defaults {
+    name: "services-stubs-default",
     installable: false,
     args: " --show-annotation android.annotation.SystemApi\\(client=android.annotation.SystemApi.Client.SYSTEM_SERVER\\)" +
         " --hide-annotation android.annotation.Hide" +
@@ -130,7 +137,13 @@
         " --hide DeprecationMismatch" +
         " --hide HiddenTypedefConstant",
     visibility: ["//visibility:private"],
-    filter_packages: ["com.android."],
+    filter_packages: ["com.android."]
+}
+
+droidstubs {
+    name: "services-stubs.sources",
+    srcs: [":services-all-sources"],
+    defaults: ["services-stubs-default"],
     check_api: {
         current: {
             api_file: "api/current.txt",
@@ -176,3 +189,34 @@
         dir: "apistubs/android/system-server",
     },
 }
+
+droidstubs {
+    name: "services-non-updatable-stubs.sources",
+    srcs: [":services-non-updatable-sources"],
+    defaults: ["services-stubs-default"],
+    check_api: {
+        current: {
+            api_file: "api/non-updatable-current.txt",
+            removed_api_file: "api/non-updatable-removed.txt",
+        },
+        api_lint: {
+            enabled: true,
+            new_since: ":android-non-updatable.api.system-server.latest",
+            baseline_file: "api/non-updatable-lint-baseline.txt",
+        },
+    },
+    dists: [
+        {
+            targets: ["sdk", "win_sdk"],
+            dir: "apistubs/android/system-server/api",
+            dest: "android-non-updatable.txt",
+            tag: ".api.txt"
+        },
+        {
+            targets: ["sdk", "win_sdk"],
+            dir: "apistubs/android/system-server/api",
+            dest: "android-non-updatable-removed.tx",
+            tag: ".removed-api.txt",
+        },
+    ]
+}
\ No newline at end of file