Merge "Dist the merged api txts for normal builds too" am: 208cdcbf3f

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1468242

Change-Id: Ia6e2c3fff4393f9351b4af905b1a2c2a1ff79c83

1 files changed, 57 insertions, 15 deletions

diff --git a/api/Android.bp b/api/Android.bp
index fd0303b31de9..9f99b78c11c4 100644
--- a/api/Android.bp
+++ b/api/Android.bp
@@ -60,11 +60,18 @@ genrule {
     out: ["current.txt"],
     tools: ["metalava"],
     cmd: "$(location metalava) --no-banner --format=v2 $(in) --api $(out)",
-    dist: {
-        targets: ["sdk", "win_sdk"],
-        dir: "apistubs/android/public/api",
-        dest: "android.txt",
-    },
+    dists: [
+        {
+            targets: ["droidcore"],
+            dir: "api",
+            dest: "current.txt",
+        },
+        {
+            targets: ["sdk", "win_sdk"],
+            dir: "apistubs/android/public/api",
+            dest: "android.txt",
+        },
+    ],
 }
 
 genrule {
@@ -83,6 +90,13 @@ genrule {
     out: ["removed.txt"],
     tools: ["metalava"],
     cmd: "$(location metalava) --no-banner --format=v2 $(in) --api $(out)",
+    dists: [
+        {
+            targets: ["droidcore"],
+            dir: "api",
+            dest: "removed.txt",
+        },
+    ],
 }
 
 genrule {
@@ -100,11 +114,18 @@ genrule {
     out: ["system-current.txt"],
     tools: ["metalava"],
     cmd: "$(location metalava) --no-banner --format=v2 $(in) --api $(out)",
-    dist: {
-        targets: ["sdk", "win_sdk"],
-        dir: "apistubs/android/system/api",
-        dest: "android.txt",
-    },
+    dists: [
+        {
+            targets: ["droidcore"],
+            dir: "api",
+            dest: "system-current.txt",
+        },
+        {
+            targets: ["sdk", "win_sdk"],
+            dir: "apistubs/android/system/api",
+            dest: "android.txt",
+        },
+    ],
 }
 
 genrule {
@@ -122,6 +143,13 @@ genrule {
     out: ["system-removed.txt"],
     tools: ["metalava"],
     cmd: "$(location metalava) --no-banner --format=v2 $(in) --api $(out)",
+    dists: [
+        {
+            targets: ["droidcore"],
+            dir: "api",
+            dest: "system-removed.txt",
+        },
+    ],
 }
 
 genrule {
@@ -139,11 +167,18 @@ genrule {
     out: ["module-lib-current.txt"],
     tools: ["metalava"],
     cmd: "$(location metalava) --no-banner --format=v2 $(in) --api $(out)",
-    dist: {
-        targets: ["sdk", "win_sdk"],
-        dir: "apistubs/android/module-lib/api",
-        dest: "android.txt",
-    },
+    dists: [
+        {
+            targets: ["droidcore"],
+            dir: "api",
+            dest: "module-lib-current.txt",
+        },
+        {
+            targets: ["sdk", "win_sdk"],
+            dir: "apistubs/android/module-lib/api",
+            dest: "android.txt",
+        },
+    ],
 }
 
 genrule {
@@ -161,6 +196,13 @@ genrule {
     out: ["module-lib-removed.txt"],
     tools: ["metalava"],
     cmd: "$(location metalava) --no-banner --format=v2 $(in) --api $(out)",
+    dists: [
+        {
+            targets: ["droidcore"],
+            dir: "api",
+            dest: "module-lib-removed.txt",
+        },
+    ],
 }
 
 genrule {