From 65aa6ea9d19285d96d2f63684ed2124671e5611c Mon Sep 17 00:00:00 2001
From: Anton Hansson <hansson@google.com>
Date: Tue, 3 Nov 2020 19:35:56 +0000
Subject: [PATCH] Remove unused monolithic jars

Nothing depends on these. They were only here for easy comparison
with the merged variant while we ironed out diffs.

Rename the merged variants instead of having duplicate compilation
rules.

Bug: 171029603
Test: m nothing
Change-Id: I7859589b93b861439fb1b7de084e52294da53671
---
 StubLibraries.bp | 32 ++------------------------------
 1 file changed, 2 insertions(+), 30 deletions(-)

diff --git a/StubLibraries.bp b/StubLibraries.bp
index 228b3daefb812..6e3fe50299147 100644
--- a/StubLibraries.bp
+++ b/StubLibraries.bp
@@ -317,14 +317,7 @@ java_defaults {
 }
 
 java_library_static {
-    name: "android_monolith_stubs_current",
-    srcs: [ ":api-stubs-docs" ],
-    static_libs: [ "private-stub-annotations-jar" ],
-    defaults: ["android_defaults_stubs_current"],
-}
-
-java_library_static {
-    name: "android_merged_stubs_current",
+    name: "android_stubs_current",
     srcs: [ ":api-stubs-docs-non-updatable" ],
     static_libs: [
         "conscrypt.module.public.api.stubs",
@@ -357,22 +350,7 @@ java_library_static {
 }
 
 java_library_static {
-    name: "android_stubs_current",
-    static_libs: ["android_merged_stubs_current"],
-    defaults: ["android_defaults_stubs_current"],
-}
-
-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",
-    ],
-}
-
-java_library_static {
-    name: "android_system_merged_stubs_current",
+    name: "android_system_stubs_current",
     srcs: [ ":system-api-stubs-docs-non-updatable" ],
     static_libs: [
         "conscrypt.module.public.api.stubs",
@@ -390,12 +368,6 @@ java_library_static {
     defaults: ["android_defaults_stubs_current"],
 }
 
-java_library_static {
-    name: "android_system_stubs_current",
-    static_libs: ["android_system_merged_stubs_current"],
-    defaults: ["android_defaults_stubs_current"],
-}
-
 java_library_static {
     name: "android_test_stubs_current",
     srcs: [ ":test-api-stubs-docs" ],