From db43d8f3ab407202af8e657ecd0cbbd4f73716c4 Mon Sep 17 00:00:00 2001
From: Anton Hansson <hansson@google.com>
Date: Mon, 23 Mar 2020 17:04:23 +0000
Subject: [PATCH] Make module apis dist their output

Only populate the targets and dir attributes. The output name
will be autopopulated to the filename, which differs by module.

Bug: 149293194
Test: m dist sdk && find out/dist/apistubs -name 'framework-*.txt'
Change-Id: I8502eb90a10d8b1ca998c2eba5646c662638ce3f
Merged-In: I8502eb90a10d8b1ca998c2eba5646c662638ce3f
(cherry picked from commit a92a23bc69adc6ef61d2052433cea6dab41b91c2)
---
 apex/Android.bp | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/apex/Android.bp b/apex/Android.bp
index f28c090562cb6..388b24a4d5f59 100644
--- a/apex/Android.bp
+++ b/apex/Android.bp
@@ -148,6 +148,10 @@ stubs_defaults {
             removed_api_file: "api/removed.txt",
         },
     },
+    dist: {
+        targets: ["sdk", "win_sdk"],
+        dir: "apistubs/android/public/api",
+    },
 }
 
 stubs_defaults {
@@ -167,6 +171,10 @@ stubs_defaults {
             removed_api_file: "api/system-removed.txt",
         },
     },
+    dist: {
+        targets: ["sdk", "win_sdk"],
+        dir: "apistubs/android/system/api",
+    },
 }
 
 java_defaults {
@@ -228,6 +236,10 @@ stubs_defaults {
             removed_api_file: "api/module-lib-removed.txt",
         },
     },
+    dist: {
+        targets: ["sdk", "win_sdk"],
+        dir: "apistubs/android/module-lib/api",
+    },
 }
 
 stubs_defaults {
@@ -258,6 +270,10 @@ stubs_defaults {
             removed_api_file: "api/removed.txt",
         },
     },
+    dist: {
+        targets: ["sdk", "win_sdk"],
+        dir: "apistubs/android/system-server/api",
+    },
 }
 
 // Empty for now, but a convenient place to add rules for all