From 6f646a5f13addb01126978c49e75d70f7a7c70dc Mon Sep 17 00:00:00 2001
From: Anton Hansson <hansson@google.com>
Date: Wed, 25 Mar 2020 13:30:03 +0000
Subject: [PATCH] Dist module stub libraries for in sdk builds

Makes the stub libraries accessible to update_prebuilts.py,
so they can be finalized together with their txt files (already dist'd).

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

diff --git a/apex/Android.bp b/apex/Android.bp
index 1d147742b9933..5e0e57696933e 100644
--- a/apex/Android.bp
+++ b/apex/Android.bp
@@ -165,18 +165,30 @@ java_defaults {
     name: "framework-module-stubs-lib-defaults-publicapi",
     installable: false,
     sdk_version: "module_current",
+    dist: {
+        targets: ["sdk", "win_sdk"],
+        dir: "apistubs/android/public",
+    },
 }
 
 java_defaults {
     name: "framework-module-stubs-lib-defaults-systemapi",
     installable: false,
     sdk_version: "module_current",
+    dist: {
+        targets: ["sdk", "win_sdk"],
+        dir: "apistubs/android/system",
+    },
 }
 
 java_defaults {
     name: "framework-module-stubs-lib-defaults-module_libs_api",
     installable: false,
     sdk_version: "module_current",
+    dist: {
+        targets: ["sdk", "win_sdk"],
+        dir: "apistubs/android/module-lib",
+    },
 }
 
 // The defaults for module_libs comes in two parts - defaults for API checks
@@ -229,4 +241,8 @@ stubs_defaults {
 // module java_library system_server stub libs.
 java_defaults {
     name: "service-module-stubs-defaults",
+    dist: {
+        targets: ["sdk", "win_sdk"],
+        dir: "apistubs/android/system-server",
+    },
 }