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

Commit f7893cc6 authored by Jared Duke's avatar Jared Duke
Browse files

Remove unnecessary system_server keep rules 

By referencing the aapt-generated keep rules for framework manifest,
we can remove explicit keep rules for classes referenced in that
manifest.

Bug: 272495195
Test: m + check delta in services.jar
Change-Id: Ica8ccd0459354dacfbaec838bd70f56796c7c2e7
parent 6cf7fbde

services/proguard.flags

+0 −13
Original line number Original line Diff line number Diff line
@@ -42,19 +42,6 @@ 
-keep,allowoptimization,allowaccessmodification class * extends android.os.IInterface

-keep,allowoptimization,allowaccessmodification class * extends android.os.IInterface

-keep,allowoptimization,allowaccessmodification class * extends android.os.IHwInterface

-keep,allowoptimization,allowaccessmodification class * extends android.os.IHwInterface





# Global entities normally kept through explicit Manifest entries

# TODO(b/210510433): Revisit and consider generating from frameworks/base/core/res/AndroidManifest.xml,

# by including that manifest with the library rule that triggers optimization.

-keep,allowoptimization,allowaccessmodification class com.android.server.** extends android.app.Activity

-keep,allowoptimization,allowaccessmodification class com.android.server.** extends android.app.Service

-keep,allowoptimization,allowaccessmodification class com.android.server.** extends android.app.backup.BackupAgent

-keep,allowoptimization,allowaccessmodification class com.android.server.** extends android.content.BroadcastReceiver

-keep,allowoptimization,allowaccessmodification class com.android.server.** extends android.content.ContentProvider

-keep,allowoptimization,allowaccessmodification class com.android.server.** extends android.preference.Preference

-keep,allowoptimization,allowaccessmodification class com.android.server.** extends android.view.View {

  public <init>(...);

}



# Various classes subclassed in or referenced via JNI in ethernet-service

# Various classes subclassed in or referenced via JNI in ethernet-service

-keep public class android.net.** { *; }

-keep public class android.net.** { *; }

-keep,allowoptimization,allowaccessmodification class com.android.net.module.util.* { *; }

-keep,allowoptimization,allowaccessmodification class com.android.net.module.util.* { *; }