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

Merge "Dist merged jar instead of monolithic one" am: 7350b62384 am: e39d2d9f8c

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1486197

Change-Id: I7c7dbb2f8d5f0c2d424a3dd70652700e9f6ae623
This commit is contained in:
Anton Hansson
2020-11-04 17:38:53 +00:00
committed by Automerger Merge Worker
parent 2c4d7fcc1b e39d2d9f8c
commit cd873a8792
1 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
StubLibraries.bp
View File

@@ -332,19 +332,6 @@ java_library_static {
"framework-wifi.stubs", "framework-wifi.stubs",
"private-stub-annotations-jar", "private-stub-annotations-jar",
], ],
defaults: ["android_defaults_stubs_current"],
}
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: [ defaults: [
"android_defaults_stubs_current", "android_defaults_stubs_current",
"android_stubs_dists_default", "android_stubs_dists_default",
@@ -362,6 +349,21 @@ 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 { java_library_static {
name: "android_system_merged_stubs_current", name: "android_system_merged_stubs_current",
srcs: [ ":system-api-stubs-docs-non-updatable" ], srcs: [ ":system-api-stubs-docs-non-updatable" ],