From a410891802ba8ba26b9d6ace6ee167f38f124acf Mon Sep 17 00:00:00 2001
From: Anton Hansson <hansson@google.com>
Date: Fri, 9 Apr 2021 13:40:11 +0100
Subject: [PATCH] Dist android-non-updatable.jar for sdk

So that it is recorded when we finalize the SDK.

Bug: 184839599
Test: (cd out/dist; diff -r apistubs /tmp/apistubs-before)
    Only in apistubs/android/module-lib: android-non-updatable.jar
    Only in apistubs/android/public: android-non-updatable.jar
    Only in apistubs/android/system: android-non-updatable.jar
    Only in apistubs/android/test: android-non-updatable.jar
Change-Id: I8fe2d46b4574e602f258ab6f941e07443dfdd2a7
---
 StubLibraries.bp | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/StubLibraries.bp b/StubLibraries.bp
index ccb09fba88ca7..41cbb6a534feb 100644
--- a/StubLibraries.bp
+++ b/StubLibraries.bp
@@ -311,6 +311,11 @@ java_defaults {
     system_modules: "none",
     java_version: "1.8",
     compile_dex: true,
+    dist: {
+        targets: ["sdk", "win_sdk"],
+        tag: ".jar",
+        dest: "android-non-updatable.jar",
+    }
 }
 
 java_library_static {
@@ -318,6 +323,9 @@ java_library_static {
     defaults: ["android-non-updatable_defaults_stubs_current"],
     srcs: [":api-stubs-docs-non-updatable"],
     libs: modules_public_stubs,
+    dist: {
+        dir: "apistubs/android/public",
+    },
 }
 
 java_library_static {
@@ -325,6 +333,9 @@ java_library_static {
     defaults: ["android-non-updatable_defaults_stubs_current"],
     srcs: [ ":system-api-stubs-docs-non-updatable" ],
     libs: modules_system_stubs,
+    dist: {
+        dir: "apistubs/android/system",
+    },
 }
 
 java_library_static {
@@ -336,6 +347,9 @@ java_library_static {
         // NOTE: The below can be removed once the prebuilt stub contains IKE.
         "sdk_system_current_android.net.ipsec.ike",
     ],
+    dist: {
+        dir: "apistubs/android/module-lib",
+    },
 }
 
 java_library_static {
@@ -343,6 +357,9 @@ java_library_static {
     defaults: ["android-non-updatable_defaults_stubs_current"],
     srcs: [":test-api-stubs-docs-non-updatable"],
     libs: modules_system_stubs,
+    dist: {
+        dir: "apistubs/android/test",
+    },
 }
 
 java_defaults {