Merge "Ensure proguard doesn't over-optimize Flags Library." into tm-qpr-dev am: 833608c807 am: b33fb8a78d

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20814267 Change-Id: I2991e39e8512365072cb812ed2407e88217aa51a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-20 21:32:54 +00:00
parent 7a6c1ee450 b33fb8a78d
commit df4fda85e7
2 changed files with 4 additions and 0 deletions
--- a/packages/SystemUI/shared/Android.bp
+++ b/packages/SystemUI/shared/Android.bp
@@ -91,6 +91,9 @@ java_library {
    static_libs: [
        "SystemUI-flag-types",
    ],
+    optimize: {
+        proguard_flags_files: ["proguard_flags.flags"],
+    },
    java_version: "1.8",
    min_sdk_version: "current",
 }
--- a/packages/SystemUI/shared/proguard_flags.flags
+++ b/packages/SystemUI/shared/proguard_flags.flags
@@ -0,0 +1 @@
+-keep class * implements com.android.systemui.flags.ParcelableFlag
				`@@ -0,0 +1 @@`
				`-keep class * implements com.android.systemui.flags.ParcelableFlag`