diff options
| author | 2024-01-26 13:13:06 +0000 | |
|---|---|---|
| committer | 2024-01-26 13:13:06 +0000 | |
| commit | a9d4ed55dd47ff183b24d18f2a00963d40b83164 (patch) | |
| tree | a38c0d7ce3f77fb657b9c310bd3540b366ec8be7 /framework-s | |
| parent | fcc62ad0d77d622b4ed875fdb64c6949c89a0c0d (diff) | |
| parent | 245d9c0fa023e35a560961c536149205919a9c5a (diff) | |
Merge "Fix for permission mainline flagging" into main
Diffstat (limited to 'framework-s')
| -rw-r--r-- | framework-s/Android.bp | 1 | ||||
| -rw-r--r-- | framework-s/jarjar-rules.txt | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/framework-s/Android.bp b/framework-s/Android.bp index 6d36feb09..a23d91197 100644 --- a/framework-s/Android.bp +++ b/framework-s/Android.bp @@ -79,6 +79,7 @@ java_sdk_library { "framework-permission-s-shared", "modules-utils-build", "android.permission.flags-aconfig-java", + "permissions-aconfig-flags-lib", ], apex_available: [ "com.android.permission", diff --git a/framework-s/jarjar-rules.txt b/framework-s/jarjar-rules.txt index 22e1da3ac..da8f5a5f1 100644 --- a/framework-s/jarjar-rules.txt +++ b/framework-s/jarjar-rules.txt @@ -4,3 +4,5 @@ rule android.permission.flags.Flags android.permission.jarjar.@0 rule android.util.IndentingPrintWriter android.permission.jarjar.@0 rule com.android.internal.** android.permission.jarjar.@0 rule com.android.modules.** android.permission.jarjar.@0 +rule com.android.permission.flags.*Flags* android.permission.jarjar.@0 +rule com.android.permission.flags.Flags android.permission.jarjar.@0 |