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

Commit 2a2a0241 authored Oct 19, 2022 by Hawkwood Glazier Committed by Automerger Merge Worker Oct 19, 2022

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

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>

parents c8120afb 71833c1d

packages/SystemUI/shared/Android.bp

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -59,6 +59,9 @@ android_library {
	resource_dirs: [		resource_dirs: [
	"res",		"res",
	],		],
			optimize: {
			proguard_flags_files: ["proguard.flags"],
			},
	java_version: "1.8",		java_version: "1.8",
	min_sdk_version: "current",		min_sdk_version: "current",
	plugins: ["dagger2-compiler"],		plugins: ["dagger2-compiler"],

packages/SystemUI/shared/proguard.flags

0 → 100644

+4 −0

Original line number	Original line	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