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

Commit d64aa0da authored Dec 02, 2022 by TreeHugger Robot Committed by Automerger Merge Worker Dec 02, 2022

Merge "Refine SystemUI plugin and animation deps" into tm-qpr-dev am: 6c1d781c am: ec9ce94d

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

Change-Id: I22a5a3b4153af794a72c8048d5beb280148120c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents ac862b92 ec9ce94d

packages/SystemUI/animation/Android.bp

+1 −4

Original line number	Diff line number	Diff line
		@@ -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"],

packages/SystemUI/proguard.flags

+1 −4

Original line number	Diff line number	Diff line
		@@ -26,14 +26,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 {
		*;
		}