diff options
| author | 2024-06-20 19:14:16 -0700 | |
|---|---|---|
| committer | 2024-06-24 14:31:39 -0700 | |
| commit | 704d500bf663923d3ca7dcb9e592f43c86a47c2c (patch) | |
| tree | f700584468254e36a4a1b85d5e8767f505f7f615 | |
| parent | d6b2abee6cb6c4ba3bcd5dce6edc43e2313d3861 (diff) | |
Add platform flag libs to permissions jarjar rules
LOW_COVERAGE_REASON=NON_CODE_ONLY
Bug: 348197200
Test: atest android.compat.sjp.cts.StrictJavaPackagesTest#testApkInApex_nonClasspathClasses
Flag: NONE jarjar rule change
Change-Id: Ibb2b3551b42d97b4373012eb0a209fe3d5d2abff
| -rw-r--r-- | PermissionController/jarjar-rules.txt | 12 | ||||
| -rw-r--r-- | framework-s/jarjar-rules.txt | 8 | ||||
| -rw-r--r-- | service/jarjar-rules.txt | 12 |
3 files changed, 27 insertions, 5 deletions
diff --git a/PermissionController/jarjar-rules.txt b/PermissionController/jarjar-rules.txt index 4df97f4c0..5e70dfbbd 100644 --- a/PermissionController/jarjar-rules.txt +++ b/PermissionController/jarjar-rules.txt @@ -1,2 +1,12 @@ -rule android.permission.flags.*Flags* com.android.permissioncontroller.jarjar.@0 +rule android.content.pm.*FeatureFlags* com.android.permissioncontroller.jarjar.@0 +rule android.content.pm.FeatureFlags* com.android.permissioncontroller.jarjar.@0 +rule android.content.pm.FeatureFlags com.android.permissioncontroller.jarjar.@0 +rule android.content.pm.Flags com.android.permissioncontroller.jarjar.@0 +rule android.permission.flags.*FeatureFlags* com.android.permissioncontroller.jarjar.@0 +rule android.permission.flags.FeatureFlags* com.android.permissioncontroller.jarjar.@0 +rule android.permission.flags.FeatureFlags com.android.permissioncontroller.jarjar.@0 rule android.permission.flags.Flags com.android.permissioncontroller.jarjar.@0 +rule android.os.*FeatureFlags* com.android.permissioncontroller.jarjar.@0 +rule android.os.FeatureFlags* com.android.permissioncontroller.jarjar.@0 +rule android.os.FeatureFlags com.android.permissioncontroller.jarjar.@0 +rule android.os.Flags com.android.permissioncontroller.jarjar.@0 diff --git a/framework-s/jarjar-rules.txt b/framework-s/jarjar-rules.txt index da8f5a5f1..780410b7b 100644 --- a/framework-s/jarjar-rules.txt +++ b/framework-s/jarjar-rules.txt @@ -1,8 +1,12 @@ rule android.os.HandlerExecutor android.permission.jarjar.@0 -rule android.permission.flags.*Flags* android.permission.jarjar.@0 +rule android.permission.flags.*FeatureFlags* android.permission.jarjar.@0 +rule android.permission.flags.FeatureFlags* android.permission.jarjar.@0 +rule android.permission.flags.FeatureFlags android.permission.jarjar.@0 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.*FeatureFlags* android.permission.jarjar.@0 +rule com.android.permission.flags.FeatureFlags* android.permission.jarjar.@0 +rule com.android.permission.flags.FeatureFlags android.permission.jarjar.@0 rule com.android.permission.flags.Flags android.permission.jarjar.@0 diff --git a/service/jarjar-rules.txt b/service/jarjar-rules.txt index 3c5184ead..4e7eb1d9a 100644 --- a/service/jarjar-rules.txt +++ b/service/jarjar-rules.txt @@ -1,11 +1,19 @@ -rule android.os.*Flags* com.android.permission.jarjar.@0 +rule android.os.*FeatureFlags* com.android.permission.jarjar.@0 +rule android.os.FeatureFlags* com.android.permission.jarjar.@0 +rule android.os.FeatureFlags com.android.permission.jarjar.@0 rule android.os.Flags com.android.permission.jarjar.@0 rule android.os.HandlerExecutor com.android.permission.jarjar.@0 -rule android.permission.flags.*Flags* com.android.permission.jarjar.@0 +rule android.permission.flags.*FeatureFlags* com.android.permission.jarjar.@0 +rule android.permission.flags.FeatureFlags* com.android.permission.jarjar.@0 +rule android.permission.flags.FeatureFlags com.android.permission.jarjar.@0 rule android.permission.flags.Flags com.android.permission.jarjar.@0 rule android.util.IndentingPrintWriter com.android.permission.jarjar.@0 rule com.android.internal.** com.android.permission.jarjar.@0 rule com.android.modules.** com.android.permission.jarjar.@0 +rule com.android.permission.flags.*FeatureFlags* com.android.permission.jarjar.@0 +rule com.android.permission.flags.FeatureFlags* com.android.permission.jarjar.@0 +rule com.android.permission.flags.FeatureFlags com.android.permission.jarjar.@0 +rule com.android.permission.flags.Flags com.android.permission.jarjar.@0 rule com.android.role.*Proto com.android.permission.jarjar.@0 # TODO(b/236200992): Revisit addition of rule com.android.safetycenter.annotations, # com.android.safetycenter.internaldata, com.android.safetycenter.pendingintents and |