commit 6c1d781c7dffeabdc87257927f9f6f0ca7188244
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Dec 02 12:03:36 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Dec 02 12:03:36 2022 +0000
tree 51e534960d564fc6f9d67508234870cdbded5ba6
parent 120867a3c94f8e3653f4ebe1a4b14339a15240c3
parent 548aa374fbd950c16a3d8af6e7b6e22a3bf91edc

Merge "Refine SystemUI plugin and animation deps" into tm-qpr-dev

packages/SystemUI/animation/Android.bp

diff --git a/packages/SystemUI/animation/Android.bp b/packages/SystemUI/animation/Android.bp
index 5df79e1..e6ac48f 100644
--- a/packages/SystemUI/animation/Android.bp
+++ b/packages/SystemUI/animation/Android.bp
@@ -34,10 +34,7 @@
         "res",
     ],
 
-    static_libs: [
-        "PluginCoreLib",
-        "androidx.core_core-animation-nodeps",
-    ],
+    static_libs: ["androidx.core_core-animation-nodeps"],
 
     manifest: "AndroidManifest.xml",
     kotlincflags: ["-Xjvm-default=all"],

packages/SystemUI/proguard.flags

diff --git a/packages/SystemUI/proguard.flags b/packages/SystemUI/proguard.flags
index 1282d77..f96644f 100644
--- a/packages/SystemUI/proguard.flags
+++ b/packages/SystemUI/proguard.flags
@@ -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 {
     *;
 }