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: I53ae4b2089edb643deb743b982c21e14667f84fc

4 files changed, 26 insertions, 5 deletions

diff --git a/PermissionController/Android.bp b/PermissionController/Android.bp
index cd0ceab01..b4227f57f 100644
--- a/PermissionController/Android.bp
+++ b/PermissionController/Android.bp
@@ -37,8 +37,8 @@ genrule {
     name: "statslog-permissioncontroller-java-gen",
     tools: ["stats-log-api-gen"],
     cmd: "$(location stats-log-api-gen) --java $(out) --module permissioncontroller" +
-         " --javaPackage com.android.permissioncontroller" +
-         " --javaClass PermissionControllerStatsLog --minApiLevel 30",
+        " --javaPackage com.android.permissioncontroller" +
+        " --javaClass PermissionControllerStatsLog --minApiLevel 30",
     out: ["com/android/permissioncontroller/PermissionControllerStatsLog.java"],
 }
 
@@ -52,6 +52,9 @@ java_library {
     srcs: [
         ":statslog-permissioncontroller-java-gen",
     ],
+    lint: {
+        baseline_filename: "lint-baseline.xml",
+    },
 }
 
 // File to be included by permission controller app an mocking tests
@@ -90,7 +93,7 @@ android_app {
     kotlincflags: [
         "-Werror",
         "-opt-in=kotlinx.coroutines.DelicateCoroutinesApi",
-        "-Xjvm-default=all"
+        "-Xjvm-default=all",
     ],
 
     libs: [
@@ -162,6 +165,7 @@ android_app {
     lint: {
         strict_updatability_linting: true,
         error_checks: ["Recycle"],
+        baseline_filename: "lint-baseline.xml",
     },
 
     optimize: {
diff --git a/PermissionController/role-controller/Android.bp b/PermissionController/role-controller/Android.bp
index 1a790b730..8f8195003 100644
--- a/PermissionController/role-controller/Android.bp
+++ b/PermissionController/role-controller/Android.bp
@@ -34,4 +34,7 @@ java_library {
     installable: false,
     min_sdk_version: "30",
     sdk_version: "system_current",
+    lint: {
+        baseline_filename: "lint-baseline.xml",
+    },
 }
diff --git a/framework-s/Android.bp b/framework-s/Android.bp
index e017a7ea5..893f000a8 100644
--- a/framework-s/Android.bp
+++ b/framework-s/Android.bp
@@ -54,6 +54,9 @@ java_library {
     installable: false,
     min_sdk_version: "30",
     sdk_version: "module_current",
+    lint: {
+        baseline_filename: "lint-baseline.xml",
+    },
 }
 
 java_sdk_library {
@@ -84,6 +87,7 @@ java_sdk_library {
     jarjar_rules: "jarjar-rules.txt",
     lint: {
         strict_updatability_linting: true,
+        baseline_filename: "lint-baseline.xml",
     },
     min_sdk_version: "31",
     permitted_packages: [
diff --git a/service/Android.bp b/service/Android.bp
index 96b8fbb96..2778fdd8d 100644
--- a/service/Android.bp
+++ b/service/Android.bp
@@ -44,6 +44,9 @@ java_library {
         "com.android.permission",
         "test_com.android.permission",
     ],
+    lint: {
+        baseline_filename: "lint-baseline.xml",
+    },
 }
 
 java_library {
@@ -62,6 +65,9 @@ java_library {
     installable: false,
     min_sdk_version: "30",
     sdk_version: "system_server_current",
+    lint: {
+        baseline_filename: "lint-baseline.xml",
+    },
 }
 
 java_sdk_library {
@@ -123,6 +129,7 @@ java_sdk_library {
     ],
     lint: {
         strict_updatability_linting: true,
+        baseline_filename: "lint-baseline.xml",
     },
     min_sdk_version: "30",
     sdk_version: "system_server_current",
@@ -143,8 +150,8 @@ genrule {
     name: "statslog-service-permission-java-gen",
     tools: ["stats-log-api-gen"],
     cmd: "$(location stats-log-api-gen) --java $(out) --module permissioncontroller" +
-         " --javaPackage com.android.permission" +
-         " --javaClass PermissionStatsLog --minApiLevel 29",
+        " --javaPackage com.android.permission" +
+        " --javaClass PermissionStatsLog --minApiLevel 29",
     out: ["com/android/permission/PermissionStatsLog.java"],
 }
 
@@ -161,4 +168,7 @@ java_library {
     ],
     min_sdk_version: "30",
     sdk_version: "system_server_current",
+    lint: {
+        baseline_filename: "lint-baseline.xml",
+    },
 }