commit 3c1aa119fc6f99b1dd2d92acb1f1cb0126c0fef7
author Anton Hansson <hansson@google.com> Fri Sep 25 09:13:47 2020 +0100
committer Anton Hansson <hansson@google.com> Fri Oct 02 17:48:07 2020 +0100
tree 3b4f4bf3d0ab0f4805b031816f3c09b990804b49
parent fe6160ab9ce6c83ef6a1cefbc57955b4d9c3849b

Re-submit "Add genrules for merged removed.txt files"

No diffs vs monoliths. The TARGET_BUILD_APPS issue has been fixed.

Bug: 169034951
Test: for p in "" "system-" "module-lib-"; do
  for t in "current" "removed"; do
      echo "${p}${t}:"
      echo "$(diff -u0 \
          <($CANON frameworks/base/api/${p}${t}.txt | sort) \
          <($CANON out/soong/.intermediates/frameworks/base/api/frameworks-base-api-${p}${t}-merged.txt/gen/${p}${t}.txt | sort))"
  done
done
(cherry picked from commit cfb26e3b4c677ed4302e6c39d542dc16d0b96231)

Change-Id: I1f637b69d96c0b86f4f30da6b68f06a382e50d28

api/Android.bp

diff --git a/api/Android.bp b/api/Android.bp
index cb6d448..546f151 100644
--- a/api/Android.bp
+++ b/api/Android.bp
@@ -63,6 +63,24 @@
 }
 
 genrule {
+    name: "frameworks-base-api-removed-merged.txt",
+    srcs: [
+        ":conscrypt.module.public.api{.public.removed-api.txt}",
+        ":framework-media{.public.removed-api.txt}",
+        ":framework-mediaprovider{.public.removed-api.txt}",
+        ":framework-permission{.public.removed-api.txt}",
+        ":framework-sdkextensions{.public.removed-api.txt}",
+        ":framework-statsd{.public.removed-api.txt}",
+        ":framework-tethering{.public.removed-api.txt}",
+        ":framework-wifi{.public.removed-api.txt}",
+        ":non-updatable-removed.txt",
+    ],
+    out: ["removed.txt"],
+    tools: ["metalava"],
+    cmd: "$(location metalava) --no-banner --format=v2 $(in) --api $(out)",
+}
+
+genrule {
     name: "frameworks-base-api-system-current-merged.txt",
     srcs: [
         ":framework-media{.system.api.txt}",
@@ -80,6 +98,23 @@
 }
 
 genrule {
+    name: "frameworks-base-api-system-removed-merged.txt",
+    srcs: [
+        ":framework-media{.system.removed-api.txt}",
+        ":framework-mediaprovider{.system.removed-api.txt}",
+        ":framework-permission{.system.removed-api.txt}",
+        ":framework-sdkextensions{.system.removed-api.txt}",
+        ":framework-statsd{.system.removed-api.txt}",
+        ":framework-tethering{.system.removed-api.txt}",
+        ":framework-wifi{.system.removed-api.txt}",
+        ":non-updatable-system-removed.txt",
+    ],
+    out: ["system-removed.txt"],
+    tools: ["metalava"],
+    cmd: "$(location metalava) --no-banner --format=v2 $(in) --api $(out)",
+}
+
+genrule {
     name: "frameworks-base-api-module-lib-current-merged.txt",
     srcs: [
         ":framework-media{.module-lib.api.txt}",
@@ -95,3 +130,20 @@
     tools: ["metalava"],
     cmd: "$(location metalava) --no-banner --format=v2 $(in) --api $(out)",
 }
+
+genrule {
+    name: "frameworks-base-api-module-lib-removed-merged.txt",
+    srcs: [
+        ":framework-media{.module-lib.removed-api.txt}",
+        ":framework-mediaprovider{.module-lib.removed-api.txt}",
+        ":framework-permission{.module-lib.removed-api.txt}",
+        ":framework-sdkextensions{.module-lib.removed-api.txt}",
+        ":framework-statsd{.module-lib.removed-api.txt}",
+        ":framework-tethering{.module-lib.removed-api.txt}",
+        ":framework-wifi{.module-lib.removed-api.txt}",
+        ":non-updatable-module-lib-removed.txt",
+    ],
+    out: ["module-lib-removed.txt"],
+    tools: ["metalava"],
+    cmd: "$(location metalava) --no-banner --format=v2 $(in) --api $(out)",
+}