summaryrefslogtreecommitdiff
path: root/StubLibraries.bp
diff options
context:
space:
mode:
authorAnton Hansson <hansson@google.com>2020-11-03 19:35:56 +0000
committerAnton Hansson <hansson@google.com>2020-11-05 09:25:46 +0000
commit65aa6ea9d19285d96d2f63684ed2124671e5611c (patch)
treec676e04ea635ca028c352799eb59f9b2dd2d76ab /StubLibraries.bp
parent06cb4221e8d63a1b43165c10fc247b010036c030 (diff)
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
Diffstat (limited to 'StubLibraries.bp')
-rw-r--r--StubLibraries.bp32
1 files changed, 2 insertions, 30 deletions
diff --git a/StubLibraries.bp b/StubLibraries.bp
index 228b3daefb81..6e3fe5029914 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",
@@ -391,12 +369,6 @@ java_library_static {
}
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" ],
static_libs: [