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

Remove -without-aidls filegroups for the media apex. am: df6c25d518

Browse Source 
am: c9007ad36e

Change-Id: I2cbe3779db3934cd0826196995d64b5bb7b846ac
This commit is contained in:
Jiyong Park
2019-08-29 23:25:47 -07:00
committed by android-build-merger
parent 461ef0abc5 c9007ad36e
commit b88b263129
2 changed files with 5 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Android.bp
View File

@@ -875,7 +875,7 @@ stubs_defaults {
":opt-telephony-srcs", ":opt-telephony-srcs",
":opt-net-voip-srcs", ":opt-net-voip-srcs",
":core_public_api_files", ":core_public_api_files",
":updatable-media-srcs-without-aidls", ":updatable-media-srcs",
"test-mock/src/**/*.java", "test-mock/src/**/*.java",
"test-runner/src/**/*.java", "test-runner/src/**/*.java",
], ],
@@ -938,7 +938,7 @@ stubs_defaults {
":opt-telephony-srcs", ":opt-telephony-srcs",
":opt-net-voip-srcs", ":opt-net-voip-srcs",
":core_public_api_files", ":core_public_api_files",
":updatable-media-srcs-without-aidls", ":updatable-media-srcs",
], ],
srcs_lib: "framework", srcs_lib: "framework",
srcs_lib_whitelist_pkgs: packages_to_document, srcs_lib_whitelist_pkgs: packages_to_document,

23
media/Android.bp
View File

@@ -42,13 +42,6 @@ filegroup {
], ],
} }
filegroup {
name: "updatable-media-srcs-without-aidls",
srcs : [
":mediasession2-srcs-without-aidls",
],
}
filegroup { filegroup {
name: "mediasession2-srcs", name: "mediasession2-srcs",
srcs: [ srcs: [
@@ -67,18 +60,6 @@ filegroup {
], ],
} }
filegroup {
name: "mediasession2-srcs-without-aidls",
srcs: [
":mediasession2-srcs",
],
exclude_srcs: [
"apex/java/android/media/IMediaController2.aidl",
"apex/java/android/media/IMediaSession2.aidl",
"apex/java/android/media/IMediaSession2Service.aidl",
],
}
filegroup { filegroup {
name: "mediaplayer2-srcs", name: "mediaplayer2-srcs",
srcs: [ srcs: [
@@ -96,6 +77,7 @@ filegroup {
"apex/java/android/media/BufferingParams.java", "apex/java/android/media/BufferingParams.java",
"apex/java/android/media/ProxyDataSourceCallback.java", "apex/java/android/media/ProxyDataSourceCallback.java",
], ],
path: "apex/java",
} }
metalava_updatable_media_args = " --error UnhiddenSystemApi " + metalava_updatable_media_args = " --error UnhiddenSystemApi " +
@@ -108,7 +90,7 @@ metalava_updatable_media_args = " --error UnhiddenSystemApi " +
droidstubs { droidstubs {
name: "updatable-media-stubs", name: "updatable-media-stubs",
srcs: [ srcs: [
":updatable-media-srcs-without-aidls", ":updatable-media-srcs",
":framework-media-annotation-srcs", ":framework-media-annotation-srcs",
], ],
args: metalava_updatable_media_args, args: metalava_updatable_media_args,
@@ -120,6 +102,7 @@ droidstubs {
java_library { java_library {
name: "updatable_media_stubs", name: "updatable_media_stubs",
srcs: [":updatable-media-stubs"], srcs: [":updatable-media-stubs"],
// Ideally, sdk_version here should be "current_system", but "current - 1" is used // Ideally, sdk_version here should be "current_system", but "current - 1" is used
// to avoid dependency cycle with framework. // to avoid dependency cycle with framework.
sdk_version: "28", sdk_version: "28",