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

Merge "Unbundle ART API from android-non-updatable" am: 5a4fc1d6e1

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I453e8e0ffd9d4c09c7e8d70c166b107df071d77c
This commit is contained in:
Anton Hansson
2020-12-29 11:22:48 +00:00
committed by Automerger Merge Worker
parent 1eb96f8569 5a4fc1d6e1
commit a81a5f1bdb
3 changed files with 7 additions and 20319 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
StubLibraries.bp
View File

@@ -47,7 +47,6 @@ stubs_defaults {
"core/java/**/*.logtags", "core/java/**/*.logtags",
":opt-telephony-srcs", ":opt-telephony-srcs",
":opt-net-voip-srcs", ":opt-net-voip-srcs",
":art.module.public.api{.public.stubs.source}",
"**/package.html", "**/package.html",
], ],
sdk_version: "none", sdk_version: "none",
@@ -240,6 +239,7 @@ java_library_static {
name: "android_stubs_current", name: "android_stubs_current",
srcs: [ ":api-stubs-docs-non-updatable" ], srcs: [ ":api-stubs-docs-non-updatable" ],
static_libs: [ static_libs: [
"art.module.public.api.stubs",
"conscrypt.module.public.api.stubs", "conscrypt.module.public.api.stubs",
"framework-media.stubs", "framework-media.stubs",
"framework-mediaprovider.stubs", "framework-mediaprovider.stubs",
@@ -258,6 +258,7 @@ java_library_static {
name: "android_system_stubs_current", name: "android_system_stubs_current",
srcs: [ ":system-api-stubs-docs-non-updatable" ], srcs: [ ":system-api-stubs-docs-non-updatable" ],
static_libs: [ static_libs: [
"art.module.public.api.stubs",
"conscrypt.module.public.api.stubs", "conscrypt.module.public.api.stubs",
"framework-media.stubs.system", "framework-media.stubs.system",
"framework-mediaprovider.stubs.system", "framework-mediaprovider.stubs.system",
@@ -292,6 +293,7 @@ java_library_static {
static_libs: [ static_libs: [
// Modules do not have test APIs, but we want to include their SystemApis, like we include // Modules do not have test APIs, but we want to include their SystemApis, like we include
// the SystemApi of framework-non-updatable-sources. // the SystemApi of framework-non-updatable-sources.
"art.module.public.api.stubs",
"conscrypt.module.public.api.stubs", "conscrypt.module.public.api.stubs",
"framework-media.stubs.system", "framework-media.stubs.system",
"framework-mediaprovider.stubs.system", "framework-mediaprovider.stubs.system",
@@ -328,6 +330,7 @@ java_library_static {
"android_stubs_dists_default", "android_stubs_dists_default",
], ],
libs: ["sdk_system_29_android"], libs: ["sdk_system_29_android"],
static_libs: ["art.module.public.api.stubs"],
dist: { dist: {
dir: "apistubs/android/module-lib", dir: "apistubs/android/module-lib",
}, },

3
api/Android.bp
View File

@@ -28,6 +28,7 @@ genrule {
genrule { genrule {
name: "frameworks-base-api-current.txt", name: "frameworks-base-api-current.txt",
srcs: [ srcs: [
":art.module.public.api{.public.api.txt}",
":conscrypt.module.public.api{.public.api.txt}", ":conscrypt.module.public.api{.public.api.txt}",
":framework-media{.public.api.txt}", ":framework-media{.public.api.txt}",
":framework-mediaprovider{.public.api.txt}", ":framework-mediaprovider{.public.api.txt}",
@@ -64,6 +65,7 @@ genrule {
name: "frameworks-base-api-current.srcjar", name: "frameworks-base-api-current.srcjar",
srcs: [ srcs: [
":api-stubs-docs-non-updatable", ":api-stubs-docs-non-updatable",
":art.module.public.api{.public.stubs.source}",
":conscrypt.module.public.api{.public.stubs.source}", ":conscrypt.module.public.api{.public.stubs.source}",
":framework-media{.public.stubs.source}", ":framework-media{.public.stubs.source}",
":framework-mediaprovider{.public.stubs.source}", ":framework-mediaprovider{.public.stubs.source}",
@@ -83,6 +85,7 @@ genrule {
genrule { genrule {
name: "frameworks-base-api-removed.txt", name: "frameworks-base-api-removed.txt",
srcs: [ srcs: [
":art.module.public.api{.public.removed-api.txt}",
":conscrypt.module.public.api{.public.removed-api.txt}", ":conscrypt.module.public.api{.public.removed-api.txt}",
":framework-media{.public.removed-api.txt}", ":framework-media{.public.removed-api.txt}",
":framework-mediaprovider{.public.removed-api.txt}", ":framework-mediaprovider{.public.removed-api.txt}",

20318
core/api/current.txt
View File

File diff suppressed because it is too large Load Diff