Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c74e79cd authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add android.gsi.* keep rules to system server" into main am: 7c538b63 am: 615caa4d 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3217069



Change-Id: I4af7d4c1f5c7b4f4c1928fb0e289a6001528c0b8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 18364887 615caa4d

services/proguard.flags

+10 −5
Original line number Diff line number Diff line
@@ -52,9 +52,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
@@ -107,8 +104,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.