summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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 0115dece3..ebcb5f3f3 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",
+ },
}
java_library {
@@ -86,7 +89,7 @@ android_library {
kotlincflags: [
"-Werror",
"-opt-in=kotlinx.coroutines.DelicateCoroutinesApi",
- "-Xjvm-default=all"
+ "-Xjvm-default=all",
],
libs: [
@@ -188,6 +191,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 a73bac7a5..6d4bf52c6 100644
--- a/PermissionController/role-controller/Android.bp
+++ b/PermissionController/role-controller/Android.bp
@@ -35,4 +35,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 096992362..8d4d04ae1 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",
+ },
}
platform_compat_config {
@@ -91,6 +94,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 2e4442c15..c6a00748d 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 {
@@ -125,6 +131,7 @@ java_sdk_library {
],
lint: {
strict_updatability_linting: true,
+ baseline_filename: "lint-baseline.xml",
},
min_sdk_version: "30",
sdk_version: "system_server_current",
@@ -149,8 +156,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"],
}
@@ -167,4 +174,7 @@ java_library {
],
min_sdk_version: "30",
sdk_version: "system_server_current",
+ lint: {
+ baseline_filename: "lint-baseline.xml",
+ },
}