commit 2a2a0241986394055c60f85d6463d3da50d15f95
author Hawkwood Glazier <jglazier@google.com> Wed Oct 19 22:02:48 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed Oct 19 22:02:48 2022 +0000
tree 54568be72a74f9c0708e261dbe43fd073beb83c6
parent c8120afbc6adc6634ba604365de8f25dc2f63db7
parent 71833c1d3d6069ae8f16a9e6480f189b0be386c3

Merge "Fix gson usage with R8 full mode" into tm-qpr-dev am: 71833c1d3d

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

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

packages/SystemUI/shared/Android.bp

diff --git a/packages/SystemUI/shared/Android.bp b/packages/SystemUI/shared/Android.bp
index 3543cfc..9040ea1 100644
--- a/packages/SystemUI/shared/Android.bp
+++ b/packages/SystemUI/shared/Android.bp
@@ -59,6 +59,9 @@
     resource_dirs: [
         "res",
     ],
+    optimize: {
+        proguard_flags_files: ["proguard.flags"],
+    },
     java_version: "1.8",
     min_sdk_version: "current",
     plugins: ["dagger2-compiler"],

packages/SystemUI/shared/proguard.flags

diff --git a/packages/SystemUI/shared/proguard.flags b/packages/SystemUI/shared/proguard.flags
new file mode 100644
index 0000000..5eda045
--- /dev/null
+++ 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
\ No newline at end of file