Merge "Refine keep rules for Java classes w/ native methods" am: 170a9ababb am: 38f2d28610
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2355959 Change-Id: I5bcb07772780e20ef344ee202b115b58db7240d5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -72,6 +72,13 @@
|
|||||||
-keep,allowoptimization,allowaccessmodification class com.android.server.wm.** implements com.android.server.wm.DisplayAreaPolicy$Provider
|
-keep,allowoptimization,allowaccessmodification class com.android.server.wm.** implements com.android.server.wm.DisplayAreaPolicy$Provider
|
||||||
|
|
||||||
# JNI keep rules
|
# 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
|
# TODO(b/210510433): Revisit and fix with @Keep, or consider auto-generating from
|
||||||
# frameworks/base/services/core/jni/onload.cpp.
|
# frameworks/base/services/core/jni/onload.cpp.
|
||||||
-keep,allowoptimization,allowaccessmodification class com.android.server.broadcastradio.hal1.BroadcastRadioService { *; }
|
-keep,allowoptimization,allowaccessmodification class com.android.server.broadcastradio.hal1.BroadcastRadioService { *; }
|
||||||
|
|||||||
Reference in New Issue
Block a user