From f7893cc6086cacf0076ee7ce75367c3ff1f04a49 Mon Sep 17 00:00:00 2001 From: Jared Duke Date: Fri, 19 May 2023 22:20:32 +0000 Subject: 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 --- services/proguard.flags | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/services/proguard.flags b/services/proguard.flags index 4c2830e5c447..85d05afdccc6 100644 --- a/services/proguard.flags +++ b/services/proguard.flags @@ -42,19 +42,6 @@ -keep,allowoptimization,allowaccessmodification class * extends android.os.IInterface -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 (...); -} - # Various classes subclassed in or referenced via JNI in ethernet-service -keep public class android.net.** { *; } -keep,allowoptimization,allowaccessmodification class com.android.net.module.util.* { *; } -- cgit v1.2.3-59-g8ed1b