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: I98da53d59e12e858faaa725d6ab3300296ab74d4
Merged-In: I98da53d59e12e858faaa725d6ab3300296ab74d4

4 files changed, 34 insertions, 18 deletions

diff --git a/SettingsAPI/Android.bp b/SettingsAPI/Android.bp
index 04ad3f0e0..024367c52 100644
--- a/SettingsAPI/Android.bp
+++ b/SettingsAPI/Android.bp
@@ -16,7 +16,6 @@ package {
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
-
 android_library {
 
     name: "TvSettingsAPI",
@@ -26,23 +25,25 @@ android_library {
 
     platform_apis: true,
     static_libs: [
-            "androidx-constraintlayout_constraintlayout",
-            "androidx.recyclerview_recyclerview",
-            "androidx.preference_preference",
-            "androidx.appcompat_appcompat",
-            "androidx.legacy_legacy-preference-v14",
-            "androidx.leanback_leanback-preference",
-            "androidx.leanback_leanback",
-            "androidx.lifecycle_lifecycle-extensions",
-            "androidx.lifecycle_lifecycle-common-java8",
-            "androidx.annotation_annotation",
-            "zxing-core-1.7",
-        ],
+        "androidx-constraintlayout_constraintlayout",
+        "androidx.recyclerview_recyclerview",
+        "androidx.preference_preference",
+        "androidx.appcompat_appcompat",
+        "androidx.legacy_legacy-preference-v14",
+        "androidx.leanback_leanback-preference",
+        "androidx.leanback_leanback",
+        "androidx.lifecycle_lifecycle-extensions",
+        "androidx.lifecycle_lifecycle-common-java8",
+        "androidx.annotation_annotation",
+        "zxing-core-1.7",
+    ],
 
     errorprone: {
         enabled: false,
     },
 
     min_sdk_version: "29",
+    lint: {
+        baseline_filename: "lint-baseline.xml",
+    },
 }
-
diff --git a/TwoPanelSettingsLib/Android.bp b/TwoPanelSettingsLib/Android.bp
index a944c5d30..63d338042 100644
--- a/TwoPanelSettingsLib/Android.bp
+++ b/TwoPanelSettingsLib/Android.bp
@@ -5,8 +5,8 @@ package {
 genrule {
     name: "statslog-tvsettings-java-gen",
     tools: ["stats-log-api-gen"],
-    cmd: "$(location stats-log-api-gen) --java $(out) --module tv_settings"
-        + " --javaPackage com.android.tv.twopanelsettings.slices --javaClass TvSettingsStatsLog",
+    cmd: "$(location stats-log-api-gen) --java $(out) --module tv_settings" +
+        " --javaPackage com.android.tv.twopanelsettings.slices --javaClass TvSettingsStatsLog",
     out: ["com/android/tv/twopanelsettings/slices/TvSettingsStatsLog.java"],
 }
 
@@ -16,6 +16,9 @@ java_library {
     srcs: [
         ":statslog-tvsettings-java-gen",
     ],
+    lint: {
+        baseline_filename: "lint-baseline.xml",
+    },
 }
 
 android_library {
@@ -47,6 +50,9 @@ android_library {
         "androidx.cardview_cardview",
         "statslog-tvsettings",
     ],
+    lint: {
+        baseline_filename: "lint-baseline.xml",
+    },
 }
 
 // For the test package.
diff --git a/TwoPanelSettingsLib/src/com/android/tv/twopanelsettings/slices/Android.bp b/TwoPanelSettingsLib/src/com/android/tv/twopanelsettings/slices/Android.bp
index 3a91d7472..2f2b99761 100644
--- a/TwoPanelSettingsLib/src/com/android/tv/twopanelsettings/slices/Android.bp
+++ b/TwoPanelSettingsLib/src/com/android/tv/twopanelsettings/slices/Android.bp
@@ -5,7 +5,10 @@ package {
 android_library {
     name: "TvSliceLib",
 
-    srcs: ["builders/*.java", "SlicesConstants.java"],
+    srcs: [
+        "builders/*.java",
+        "SlicesConstants.java",
+    ],
 
     static_libs: [
         "androidx.slice_slice-builders",
@@ -20,4 +23,7 @@ android_library {
         "//apex_available:platform",
         "com.android.permission",
     ],
+    lint: {
+        baseline_filename: "lint-baseline.xml",
+    },
 }
diff --git a/unbundle/Android.bp b/unbundle/Android.bp
index 1fe59a78b..2e4f0de1c 100644
--- a/unbundle/Android.bp
+++ b/unbundle/Android.bp
@@ -16,4 +16,7 @@ android_library {
         enabled: false,
     },
     min_sdk_version: "31",
-}
\ No newline at end of file
+    lint: {
+        baseline_filename: "lint-baseline.xml",
+    },
+}