Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove unused monolithic jars

Browse Source 
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
This commit is contained in:
Anton Hansson
2020-11-03 19:35:56 +00:00
parent 06cb4221e8
commit 65aa6ea9d1
1 changed files with 2 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
StubLibraries.bp
View File

@@ -317,14 +317,7 @@ java_defaults {
} }
java_library_static { java_library_static {
name: "android_monolith_stubs_current", name: "android_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",
srcs: [ ":api-stubs-docs-non-updatable" ], srcs: [ ":api-stubs-docs-non-updatable" ],
static_libs: [ static_libs: [
"conscrypt.module.public.api.stubs", "conscrypt.module.public.api.stubs",
@@ -357,22 +350,7 @@ java_library_static {
} }
java_library_static { java_library_static {
name: "android_stubs_current", name: "android_system_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",
srcs: [ ":system-api-stubs-docs-non-updatable" ], srcs: [ ":system-api-stubs-docs-non-updatable" ],
static_libs: [ static_libs: [
"conscrypt.module.public.api.stubs", "conscrypt.module.public.api.stubs",
@@ -390,12 +368,6 @@ java_library_static {
defaults: ["android_defaults_stubs_current"], 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 { java_library_static {
name: "android_test_stubs_current", name: "android_test_stubs_current",
srcs: [ ":test-api-stubs-docs" ], srcs: [ ":test-api-stubs-docs" ],