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

Create all variants of stubs for media

Browse Source 
Add separate publicapi, systemapi and module_libs stubs for media,
and rename the updatable_media stubs to framework-media to match
the others. The impl jar still has the name updatable_media.

Bug: 147768409
Test: m
Test: m framework-media-stubs-{public,system,module_libs_}api
Change-Id: I498823de7315f78121975d36d6dc7667a8245085
This commit is contained in:
Anton Hansson
2020-02-03 15:19:59 +00:00
parent d1ab76705a
commit 12a07676ed
2 changed files with 52 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Android.bp
View File

@@ -401,7 +401,7 @@ java_defaults {
"app-compat-annotations", "app-compat-annotations",
"ext", "ext",
"unsupportedappusage", "unsupportedappusage",
"updatable_media_stubs", "framework-media-stubs-systemapi",
"framework_mediaprovider_stubs", "framework_mediaprovider_stubs",
"framework-tethering", "framework-tethering",
"framework-telephony-stubs", "framework-telephony-stubs",
@@ -517,7 +517,7 @@ java_library {
installable: false, // this lib is a build-only library installable: false, // this lib is a build-only library
static_libs: [ static_libs: [
"framework-minus-apex", "framework-minus-apex",
"updatable_media_stubs", "framework-media-stubs-systemapi",
"framework_mediaprovider_stubs", "framework_mediaprovider_stubs",
"framework-appsearch", // TODO(b/146218515): should be framework-appsearch-stubs "framework-appsearch", // TODO(b/146218515): should be framework-appsearch-stubs
"framework-permission-stubs", "framework-permission-stubs",

59
apex/media/framework/Android.bp
View File

@@ -99,13 +99,10 @@ filegroup {
path: "java" path: "java"
} }
droidstubs { stubs_defaults {
name: "updatable-media-stubs", name: "framework-media-stubs-srcs-defaults",
srcs: [ srcs: [ ":updatable-media-srcs" ],
":updatable-media-srcs", libs: [ "framework_media_annotation" ],
":framework-media-annotation-srcs",
],
defaults: [ "framework-module-stubs-defaults-systemapi" ],
aidl: { aidl: {
// TODO(b/135922046) remove this // TODO(b/135922046) remove this
include_dirs: ["frameworks/base/core/java"], include_dirs: ["frameworks/base/core/java"],
@@ -113,9 +110,53 @@ droidstubs {
sdk_version: "system_current", sdk_version: "system_current",
} }
droidstubs {
name: "framework-media-stubs-srcs-publicapi",
defaults: [
"framework-media-stubs-srcs-defaults",
"framework-module-stubs-defaults-publicapi",
],
}
droidstubs {
name: "framework-media-stubs-srcs-systemapi",
defaults: [
"framework-media-stubs-srcs-defaults",
"framework-module-stubs-defaults-systemapi",
],
}
droidstubs {
name: "framework-media-api-module_libs_api",
defaults: [
"framework-media-stubs-srcs-defaults",
"framework-module-api-defaults-module_libs_api",
],
}
droidstubs {
name: "framework-media-stubs-srcs-module_libs_api",
defaults: [
"framework-media-stubs-srcs-defaults",
"framework-module-stubs-defaults-module_libs_api",
],
}
java_library { java_library {
name: "updatable_media_stubs", name: "framework-media-stubs-publicapi",
srcs: [":updatable-media-stubs"], srcs: [":framework-media-stubs-srcs-publicapi"],
sdk_version: "current",
}
java_library {
name: "framework-media-stubs-systemapi",
srcs: [":framework-media-stubs-srcs-systemapi"],
sdk_version: "system_current",
}
java_library {
name: "framework-media-stubs-module_libs_api",
srcs: [":framework-media-stubs-srcs-module_libs_api"],
sdk_version: "system_current", sdk_version: "system_current",
} }