diff options
| author | Cole Faust <colefaust@google.com> | 2023-12-20 11:57:08 -0800 |
|---|---|---|
| committer | Cole Faust <colefaust@google.com> | 2023-12-20 11:57:08 -0800 |
| commit | 8641d6bca4a569d3d0223f6e61a6ed6c19a82a66 (patch) | |
| tree | 64e27c9eb38e8f1a2f25959697ea67aa60958b88 | |
| parent | f1b4f84236df4c9a5fab15f642f8180c7f8fcab2 (diff) | |
| download | Media-8641d6bca4a569d3d0223f6e61a6ed6c19a82a66.tar.gz | |
List baseline_filename on modules that are implititly using it
lintable modules currently pick up files named "lint-baseline.xml" to use as the
lint baseline implicitly. This is confusing because you could end up using the
baseline files in more modules than intended. Lint also has a feature where it
requests you remove unnecessary findings from the baseline file, so something
could be necessary for one module, but unnecessary for another that accidentally
picked up the baseline.
We're removing the implicit detection of the baseline file, which requires
all modules using it to list the baseline file explicitly.
Bug: 272769514
Test: Presubmits
Change-Id: Ic2a8b91bde5fc5610d8814f1dfcd0f41e3567948
| -rw-r--r-- | apex/framework/Android.bp | 4 | ||||
| -rw-r--r-- | apex/service/Android.bp | 3 |
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", |