summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCole Faust <colefaust@google.com>2023-12-21 22:02:10 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-12-21 22:02:10 +0000
commit7f3feaeab815399c4471d540e8eb13c52b2a6906 (patch)
tree64e27c9eb38e8f1a2f25959697ea67aa60958b88
parentccd9a85b88c71dd0ce76013d9be98be3adc76294 (diff)
parent8641d6bca4a569d3d0223f6e61a6ed6c19a82a66 (diff)
downloadMedia-7f3feaeab815399c4471d540e8eb13c52b2a6906.tar.gz
List baseline_filename on modules that are implititly using it am: 8641d6bca4
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Media/+/2886429 Change-Id: I09179c63185655119753a1c47c2a8526d46af219 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--apex/framework/Android.bp4
-rw-r--r--apex/service/Android.bp3
2 files changed, 6 insertions, 1 deletions
diff --git a/apex/framework/Android.bp b/apex/framework/Android.bp
index 80595f4..08c24ef 100644
--- a/apex/framework/Android.bp
+++ b/apex/framework/Android.bp
@@ -57,6 +57,9 @@ java_library {
"//frameworks/base",
"//frameworks/base/apex/media/service",
],
+ lint: {
+ baseline_filename: "lint-baseline.xml",
+ },
}
filegroup {
@@ -148,6 +151,7 @@ java_sdk_library {
],
lint: {
strict_updatability_linting: true,
+ baseline_filename: "lint-baseline.xml",
},
min_sdk_version: "29",
permitted_packages: [
diff --git a/apex/service/Android.bp b/apex/service/Android.bp
index 011cdc6..580c67c 100644
--- a/apex/service/Android.bp
+++ b/apex/service/Android.bp
@@ -33,7 +33,7 @@ java_sdk_library {
defaults: [
"framework-system-server-module-defaults",
"framework-system-server-module-optimize-defaults",
- ],
+ ],
srcs: [
":service-media-s-sources",
],
@@ -48,6 +48,7 @@ java_sdk_library {
min_sdk_version: "29", // TODO: We may need to bump this at some point.
lint: {
strict_updatability_linting: true,
+ baseline_filename: "lint-baseline.xml",
},
apex_available: [
"com.android.media",