From 9b0a74f0a3ae653954f432bf8892533aa2522015 Mon Sep 17 00:00:00 2001
From: Anton Hansson <hansson@google.com>
Date: Tue, 11 Aug 2020 12:54:40 +0100
Subject: [PATCH] Revert "Add bp-based disting of android stubs"

This reverts commit d116c6038365732a22de293ad8440e808b0f2f3e.

Bug: 162595755
Test: unzip -l out/dist/android_system.jar | grep resources.arsc
Change-Id: I1445bc742ea2f895291ffd80bdc0cf86e1b8878a
---
 StubLibraries.bp    | 49 +++------------------------------------------
 services/Android.bp |  4 ----
 2 files changed, 3 insertions(+), 50 deletions(-)

diff --git a/StubLibraries.bp b/StubLibraries.bp
index 6b989951d3311..a9e6e5af47f12 100644
--- a/StubLibraries.bp
+++ b/StubLibraries.bp
@@ -311,15 +311,6 @@ java_defaults {
     compile_dex: true,
 }
 
-java_defaults {
-    name: "android_stubs_dists_default",
-    dist: {
-        targets: ["sdk", "win_sdk"],
-        tag: ".jar",
-        dest: "android.jar",
-    },
-}
-
 java_library_static {
     name: "android_monolith_stubs_current",
     srcs: [ ":api-stubs-docs" ],
@@ -354,21 +345,7 @@ java_library_static {
     name: "android_system_monolith_stubs_current",
     srcs: [ ":system-api-stubs-docs" ],
     static_libs: [ "private-stub-annotations-jar" ],
-    defaults: [
-        "android_defaults_stubs_current",
-        "android_stubs_dists_default",
-    ],
-    dist: {
-        dir: "apistubs/android/system",
-    },
-    dists: [
-        {
-            // Legacy dist path
-            targets: ["sdk", "win_sdk"],
-            tag: ".jar",
-            dest: "android_system.jar",
-        },
-    ],
+    defaults: ["android_defaults_stubs_current"],
 }
 
 java_library_static {
@@ -398,34 +375,14 @@ java_library_static {
     name: "android_test_stubs_current",
     srcs: [ ":test-api-stubs-docs" ],
     static_libs: [ "private-stub-annotations-jar" ],
-    defaults: [
-        "android_defaults_stubs_current",
-        "android_stubs_dists_default",
-    ],
-    dist: {
-        dir: "apistubs/android/test",
-    },
-    dists: [
-        {
-            // Legacy dist path
-            targets: ["sdk", "win_sdk"],
-            tag: ".jar",
-            dest: "android_test.jar",
-        },
-    ],
+    defaults: ["android_defaults_stubs_current"],
 }
 
 java_library_static {
     name: "android_module_lib_stubs_current",
     srcs: [ ":module-lib-api-stubs-docs-non-updatable" ],
-    defaults: [
-        "android_defaults_stubs_current",
-        "android_stubs_dists_default",
-    ],
+    defaults: ["android_defaults_stubs_current"],
     libs: ["sdk_system_29_android"],
-    dist: {
-        dir: "apistubs/android/module-lib",
-    },
 }
 
 java_library_static {
diff --git a/services/Android.bp b/services/Android.bp
index f0144ac1c6959..40b925de95d6e 100644
--- a/services/Android.bp
+++ b/services/Android.bp
@@ -154,14 +154,10 @@ droidstubs {
 
 java_library {
     name: "android_system_server_stubs_current",
-    defaults: ["android_stubs_dists_default"],
     srcs: [":services-stubs.sources"],
     installable: false,
     static_libs: ["android_module_lib_stubs_current"],
     sdk_version: "none",
     system_modules: "none",
     java_version: "1.8",
-    dist: {
-        dir: "apistubs/android/system-server",
-    },
 }