From 4774e6c9fc86749c1f6e40249ed86b8282fcbbc6 Mon Sep 17 00:00:00 2001
From: Caren Chang <carenc@google.com>
Date: Mon, 2 May 2022 11:34:17 -0700
Subject: [PATCH] Fix release builds by adding proguard rule for DataStore

Bug: 228863401

Change-Id: I6cd43b0ed7844f7622e362fb77e5213064a629f3
---
 core-datastore/build.gradle.kts            | 6 ++++++
 core-datastore/consumer-proguard-rules.pro | 4 ++++
 2 files changed, 10 insertions(+)
 create mode 100644 core-datastore/consumer-proguard-rules.pro

diff --git a/core-datastore/build.gradle.kts b/core-datastore/build.gradle.kts
index f9a5b154d..2ccc9ade1 100644
--- a/core-datastore/build.gradle.kts
+++ b/core-datastore/build.gradle.kts
@@ -28,6 +28,12 @@ plugins {
     id("nowinandroid.spotless")
 }
 
+android {
+    defaultConfig {
+        consumerProguardFiles("consumer-proguard-rules.pro")
+    }
+}
+
 // Setup protobuf configuration, generating lite Java and Kotlin classes
 protobuf {
     protoc {
diff --git a/core-datastore/consumer-proguard-rules.pro b/core-datastore/consumer-proguard-rules.pro
new file mode 100644
index 000000000..173273916
--- /dev/null
+++ b/core-datastore/consumer-proguard-rules.pro
@@ -0,0 +1,4 @@
+# Keep DataStore fields
+-keepclassmembers class * extends com.google.protobuf.GeneratedMessageLite* {
+   <fields>;
+}
\ No newline at end of file