summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTimothy Yiu <tyiu@google.com>2024-03-22 16:18:33 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2024-03-22 16:18:33 +0000
commit5045c826571534f7b3b5f825356fad529c3c6e69 (patch)
tree5ab6ff479f2d6416657adf433c8148540b39d582
parent11bb56ec5cbdcfd59f24179f536213040ea7f63b (diff)
parent1149dbb04b5a367c46bcfa5fcc0083dc2767a8eb (diff)
downloadbase-5045c826571534f7b3b5f825356fad529c3c6e69.tar.gz
Merge "Refine system service proguard rules" into main
-rw-r--r--services/proguard.flags5
1 files changed, 4 insertions, 1 deletions
diff --git a/services/proguard.flags b/services/proguard.flags
index 88561b460b05..a01e7dc16147 100644
--- a/services/proguard.flags
+++ b/services/proguard.flags
@@ -54,7 +54,10 @@
-keep,allowoptimization,allowaccessmodification class android.app.admin.flags.FeatureFlagsImpl { *; }
-keep,allowoptimization,allowaccessmodification class com.android.server.input.NativeInputManagerService$NativeImpl { *; }
-keep,allowoptimization,allowaccessmodification class com.android.server.ThreadPriorityBooster { *; }
--keep,allowaccessmodification class android.app.admin.flags.Flags { *; }
+
+# Keep all aconfig Flag class as they might be statically referenced by other packages
+# An merge or inlining could lead to missing dependencies that cause run time errors
+-keepclassmembernames class android.**.Flags, com.android.**.Flags { public *; }
# Referenced via CarServiceHelperService in car-frameworks-service (avoid removing)
-keep public class com.android.server.utils.Slogf { *; }