Merge "Fix gson usage with R8 full mode"

2022-07-08 23:07:09 +00:00
parent 9794591e1c 994594ba6f
commit 6c5166c711
2 changed files with 7 additions and 0 deletions
--- a/packages/SystemUI/shared/Android.bp
+++ b/packages/SystemUI/shared/Android.bp
@@ -59,6 +59,9 @@ android_library {
    resource_dirs: [
        "res",
    ],
+    optimize: {
+        proguard_flags_files: ["proguard.flags"],
+    },
    java_version: "1.8",
    min_sdk_version: "current",
    plugins: ["dagger2-compiler"],
--- a/packages/SystemUI/shared/proguard.flags
+++ b/packages/SystemUI/shared/proguard.flags
@@ -0,0 +1,4 @@
+# Retain signatures of TypeToken and its subclasses for gson usage in ClockRegistry
+-keepattributes Signature
+-keep,allowobfuscation,allowshrinking class com.google.gson.reflect.TypeToken
+-keep,allowobfuscation,allowshrinking class * extends com.google.gson.reflect.TypeToken