diff options
| -rw-r--r-- | StubLibraries.bp | 32 | 
1 files changed, 2 insertions, 30 deletions
diff --git a/StubLibraries.bp b/StubLibraries.bp index aabf23b9f821..cff96b71f8c2 100644 --- a/StubLibraries.bp +++ b/StubLibraries.bp @@ -312,14 +312,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", @@ -350,22 +343,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", @@ -382,12 +360,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: [  |