From 548aa374fbd950c16a3d8af6e7b6e22a3bf91edc Mon Sep 17 00:00:00 2001
From: Jared Duke <jdduke@google.com>
Date: Wed, 30 Nov 2022 13:38:17 -0800
Subject: [PATCH] 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
---
 packages/SystemUI/animation/Android.bp | 5 +----
 packages/SystemUI/proguard.flags       | 5 +----
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/packages/SystemUI/animation/Android.bp b/packages/SystemUI/animation/Android.bp
index 5df79e1bee942..e6ac48ff5af8d 100644
--- a/packages/SystemUI/animation/Android.bp
+++ b/packages/SystemUI/animation/Android.bp
@@ -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"],
diff --git a/packages/SystemUI/proguard.flags b/packages/SystemUI/proguard.flags
index 1282d771579e3..f96644fbd6673 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 {
     *;
 }