summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Richard MacGregor <rmacgregor@google.com> 2023-11-29 16:28:37 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2023-11-29 16:28:37 +0000
commitbc81f44b257389a1e71fb162ecd37a2d124c8eee (patch)
tree223916ea993a8663dfb6ee07d11df553b920a945
parent08dcebf2cbecc7e9e223f6904eb2d1a84a5c91b4 (diff)
parent990ebbf987b9b8972831744e9bdce0057dbc6ed8 (diff)
Merge "Add permission flags lib to jarjar" into main
-rw-r--r--PermissionController/Android.bp3
-rw-r--r--PermissionController/jarjar-rules.txt1
2 files changed, 4 insertions, 0 deletions
diff --git a/PermissionController/Android.bp b/PermissionController/Android.bp
index 86e883c0d..0115dece3 100644
--- a/PermissionController/Android.bp
+++ b/PermissionController/Android.bp
@@ -164,6 +164,9 @@ android_library {
"//apex_available:platform",
"com.android.permission",
],
+
+ // TODO(b/313706381): Remove jarjar once flagging lib is fixed
+ jarjar_rules: "jarjar-rules.txt",
}
android_app {
diff --git a/PermissionController/jarjar-rules.txt b/PermissionController/jarjar-rules.txt
new file mode 100644
index 000000000..f4d8a0be2
--- /dev/null
+++ b/PermissionController/jarjar-rules.txt
@@ -0,0 +1 @@
+rule android.permission.flags.** com.android.permissioncontroller.jarjar.@0