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

Commit 3b6191e6 authored by Jared Duke's avatar Jared Duke Committed by Selim Cinek
Browse files

Fix gson usage with R8 full mode 

Ensure the appropriate signatures are retained for ClockRegistry's gson
usage when R8 full mode is enabled.

Bug: 215530220
Bug: 229771520
Test: m + boot tests
Change-Id: I824b870a355a4cfea04e55d5648a6c441ab446d3
(cherry picked from commit 994594ba)
Merged-In: I824b870a355a4cfea04e55d5648a6c441ab446d3
parent ec8ab3a6

packages/SystemUI/shared/Android.bp

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

packages/SystemUI/shared/proguard.flags

0 → 100644
+4 −0
Original line number Diff line number Diff line 
# 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