summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCole Faust <colefaust@google.com>2023-12-21 22:02:08 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-12-21 22:02:08 +0000
commit893f6a9a3f3412d4c6132758ec226ce07cf4f175 (patch)
tree63e420f075bc32643d9d7d47a9d77a0954c8d978
parentd5b82aab34e266dd1bf0c8d4606e3da4cb0dce6d (diff)
parent56793826fd2f7ff6c24455f075cf05ec92c174c3 (diff)
downloadPermission-893f6a9a3f3412d4c6132758ec226ce07cf4f175.tar.gz
List baseline_filename on modules that are implititly using it am: 56793826fd
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Permission/+/2886328 Change-Id: Idd578f40fddec1e75b1a38de7c8c5d9c7df32b29 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--PermissionController/Android.bp10
-rw-r--r--PermissionController/role-controller/Android.bp3
-rw-r--r--framework-s/Android.bp4
-rw-r--r--service/Android.bp14
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",
+ },
}