From a17858d1f39929854a1dbdd218cb9208ddeef680 Mon Sep 17 00:00:00 2001 From: Bill Lin Date: Tue, 14 Jul 2020 10:30:10 +0800 Subject: [PATCH] SystemUI include static lib WindowManager-Shell(1/N) Test: make SystemUI Test: $OUT_TARGET/common/obj/APPS/SystemUI_intermediates/classes.jar \ include /com/android/wm/shell/WindowManagerShell.class Test: $OUT/system_ext/priv-app/SystemUI/SystemUI.apk \ decompile classes.dex to find WindowManagerShell.class Test: atest SystemUITests Bug: 161118569 Change-Id: I886222562458b8b1f5a2ec36dc5345073d08221c --- packages/SystemUI/Android.bp | 3 ++- packages/SystemUI/proguard.flags | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/packages/SystemUI/Android.bp b/packages/SystemUI/Android.bp index 6ecf303c6dc89..dfc47587b91c4 100644 --- a/packages/SystemUI/Android.bp +++ b/packages/SystemUI/Android.bp @@ -140,7 +140,8 @@ android_library { "testables", "truth-prebuilt", "dagger2", - "jsr330" + "jsr330", + "WindowManager-Shell", ], libs: [ "android.test.runner", diff --git a/packages/SystemUI/proguard.flags b/packages/SystemUI/proguard.flags index 2a2ba1b0ccaad..14097b12e7303 100644 --- a/packages/SystemUI/proguard.flags +++ b/packages/SystemUI/proguard.flags @@ -39,4 +39,6 @@ -keep public class * extends com.android.systemui.SystemUI { public (android.content.Context); -} \ No newline at end of file +} + +-keep class com.android.wm.shell.* \ No newline at end of file