diff options
| author | 2022-11-14 18:05:42 +0000 | |
|---|---|---|
| committer | 2022-11-14 18:05:42 +0000 | |
| commit | 03736d2d738118dc3a447e2ec7104b829bdbf7dd (patch) | |
| tree | c4225f8c00ee3df744c4f72f9ad607a147a50e0e | |
| parent | 9c7f780a5dac51987a6ec16e2aa1a17ce6a319b8 (diff) | |
| parent | 180e21a9fea558b81ae5667b5375281b7c73eb75 (diff) | |
Merge "Remove proguard.flags from shared/" into tm-qpr-dev am: 180e21a9fe
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20446402
Change-Id: Ic9095193379122bc2227f14646e99eb9245bfcb2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | packages/SystemUI/shared/Android.bp | 3 | ||||
| -rw-r--r-- | packages/SystemUI/shared/proguard.flags | 4 |
2 files changed, 0 insertions, 7 deletions
diff --git a/packages/SystemUI/shared/Android.bp b/packages/SystemUI/shared/Android.bp index 485a0d320bb9..8a0fca03fe3a 100644 --- a/packages/SystemUI/shared/Android.bp +++ b/packages/SystemUI/shared/Android.bp @@ -63,9 +63,6 @@ android_library { resource_dirs: [ "res", ], - optimize: { - proguard_flags_files: ["proguard.flags"], - }, min_sdk_version: "current", plugins: ["dagger2-compiler"], kotlincflags: ["-Xjvm-default=enable"], diff --git a/packages/SystemUI/shared/proguard.flags b/packages/SystemUI/shared/proguard.flags deleted file mode 100644 index 5eda04500190..000000000000 --- a/packages/SystemUI/shared/proguard.flags +++ /dev/null @@ -1,4 +0,0 @@ -# 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 |