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

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

Merge "Refine keep rules for Java classes w/ native methods" am: 170a9aba... 

Merge "Refine keep rules for Java classes w/ native methods" am: 170a9aba am: 38f2d286 am: cc79cea3

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



Change-Id: Ie180dc4d9735839bbbf5664b81391df8afe3d045
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9a2d277c cc79cea3

services/proguard.flags

+7 −0
Original line number Diff line number Diff line
@@ -78,6 +78,13 @@ 
-keep,allowoptimization,allowaccessmodification class com.android.server.wm.** implements com.android.server.wm.DisplayAreaPolicy$Provider



# JNI keep rules

# The global keep rule for native methods allows stripping of such methods if they're unreferenced

# in Java. However, because system_server explicitly registers these methods from native code,

# stripping them in Java can cause runtime issues. As such, conservatively keep all such methods in

# system_server subpackages as long as the containing class is also kept or referenced.

-keepclassmembers class com.android.server.** {

  native <methods>;

}

# TODO(b/210510433): Revisit and fix with @Keep, or consider auto-generating from

# frameworks/base/services/core/jni/onload.cpp.

-keep,allowoptimization,allowaccessmodification class com.android.server.broadcastradio.hal1.BroadcastRadioService { *; }