Refine SystemUI plugin and animation deps
The PluginCoreLib dependency is not needed by SystemUIAnimationLib, and can conflict with downstream plugins that might want to use the animation lib statically. Remove the dependency, and also remove the animation Proguard rules that were intended to make the animation lib another shared library for plugins. Test: m Bug: 215530220 Change-Id: Ib96e8b0e6f1d4a432c16e699da79ac2de44c9789
This commit is contained in:
@@ -34,10 +34,7 @@ android_library {
|
||||
"res",
|
||||
],
|
||||
|
||||
static_libs: [
|
||||
"PluginCoreLib",
|
||||
"androidx.core_core-animation-nodeps",
|
||||
],
|
||||
static_libs: ["androidx.core_core-animation-nodeps"],
|
||||
|
||||
manifest: "AndroidManifest.xml",
|
||||
kotlincflags: ["-Xjvm-default=all"],
|
||||
|
||||
@@ -23,14 +23,11 @@
|
||||
-keep class ** extends androidx.preference.PreferenceFragment
|
||||
-keep class com.android.systemui.tuner.*
|
||||
|
||||
# The plugins and animation subpackages both act as shared libraries that might be referenced in
|
||||
# The plugins subpackage acts as a shared library that might be referenced in
|
||||
# dynamically-loaded plugin APKs.
|
||||
-keep class com.android.systemui.plugins.** {
|
||||
*;
|
||||
}
|
||||
-keep class !com.android.systemui.animation.R$**,com.android.systemui.animation.** {
|
||||
*;
|
||||
}
|
||||
-keep class com.android.systemui.fragments.FragmentService$FragmentCreator {
|
||||
*;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user