Merge changes from topic "cp-rvc-aosp" into sc-dev

* changes:
  [automerged blank] Add Emergency callback mode shell command 2p: b201f9b1e6
  Add Emergency callback mode shell command

1 files changed, 0 insertions, 46 deletions

diff --git a/api/Android.bp b/api/Android.bp
index 1fdf1771bb13..1d4698e7c512 100644
--- a/api/Android.bp
+++ b/api/Android.bp
@@ -347,49 +347,3 @@ genrule {
     out: ["combined-removed-dex.txt"],
     cmd: "$(location gen_combined_removed_dex.sh) $(location metalava) $(genDir) $(in) > $(out)",
 }
-
-genrule {
-    name: "services-system-server-current.txt",
-    srcs: [
-        ":service-permission{.system-server.api.txt}",
-        ":non-updatable-system-server-current.txt",
-    ],
-    out: ["system-server-current.txt"],
-    tools: ["metalava"],
-    cmd: "$(location metalava) --no-banner --format=v2 $(in) --api $(out)",
-    dists: [
-        {
-            targets: ["droidcore"],
-            dir: "api",
-            dest: "system-server-current.txt",
-        },
-        {
-            targets: ["sdk", "win_sdk"],
-            dir: "apistubs/android/system-server/api",
-            dest: "merge-android.txt",
-        },
-    ],
-}
-
-genrule {
-    name: "services-system-server-removed.txt",
-    srcs: [
-        ":service-permission{.system-server.removed-api.txt}",
-        ":non-updatable-system-server-removed.txt",
-    ],
-    out: ["system-server-removed.txt"],
-    tools: ["metalava"],
-    cmd: "$(location metalava) --no-banner --format=v2 $(in) --api $(out)",
-    dists: [
-        {
-            targets: ["droidcore"],
-            dir: "api",
-            dest: "system-server-removed.txt",
-        },
-        {
-            targets: ["sdk", "win_sdk"],
-            dir: "apistubs/android/system-server/api",
-            dest: "merge-removed.txt",
-        },
-    ],
-}