diff options
| author | 2024-08-14 00:47:00 +0000 | |
|---|---|---|
| committer | 2024-08-14 00:47:00 +0000 | |
| commit | 7c538b63ca0b6529825d327c717179c06e642f73 (patch) | |
| tree | d55ee5db5e3cc567f76a9816d042a71ac0231c9d | |
| parent | 639a67fde2e3efb880589075c4a2d8578bf54cd4 (diff) | |
| parent | e236dd7f1889006dfc98a16cf15bc594557d96ca (diff) | |
Merge "Add android.gsi.* keep rules to system server" into main
| -rw-r--r-- | services/proguard.flags | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/services/proguard.flags b/services/proguard.flags index f84eff79bb15..21d048854092 100644 --- a/services/proguard.flags +++ b/services/proguard.flags @@ -57,9 +57,6 @@ -keep public class com.android.server.utils.Slogf { *; } # Referenced in wear-service -# HIDL interfaces --keep public class android.hidl.base.** { *; } --keep public class android.hidl.manager.** { *; } -keep public class com.android.server.wm.WindowManagerInternal { *; } # JNI keep rules @@ -112,8 +109,16 @@ -keep,allowoptimization,allowaccessmodification class com.android.server.SystemService { *; } -keep,allowoptimization,allowaccessmodification class com.android.server.SystemService$TargetUser { *; } -keep,allowoptimization,allowaccessmodification class com.android.server.usage.StorageStatsManagerLocal { *; } --keep,allowoptimization,allowaccessmodification class com.android.internal.util.** { *; } --keep,allowoptimization,allowaccessmodification class android.os.** { *; } + +# Prevent optimizations of any statically linked code that may shadow code in +# the bootclasspath. See also StrictJavaPackagesTest for details on exceptions. +# TODO(b/222468116): Resolve such collisions in the build system. +-keep public class android.gsi.** { *; } +-keep public class android.hidl.base.** { *; } +-keep public class android.hidl.manager.** { *; } +-keep public class android.os.** { *; } +-keep public class com.android.internal.util.** { *; } +-keep public class com.android.modules.utils.build.** { *; } # CoverageService guards optional jacoco class references with a runtime guard, so we can safely # suppress build-time warnings. |