From 9c8df094a769488113e8d8324f7be09e2d3cc9fa Mon Sep 17 00:00:00 2001
From: Colin Lee <mncolinlee@gmail.com>
Date: Mon, 18 Feb 2019 08:42:25 -0600
Subject: [PATCH] Fixes #571: Startup IncompatibleClassChangeError crash on
 Android 6.0

---
 architecture/build.gradle       | 1 +
 architecture/proguard-rules.pro | 1 +
 2 files changed, 2 insertions(+)

diff --git a/architecture/build.gradle b/architecture/build.gradle
index 91fc85f03..9301e3831 100644
--- a/architecture/build.gradle
+++ b/architecture/build.gradle
@@ -19,6 +19,7 @@ android {
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+            consumerProguardFiles 'proguard-rules.pro'
         }
     }
 }
diff --git a/architecture/proguard-rules.pro b/architecture/proguard-rules.pro
index f1b424510..2c860f1ee 100644
--- a/architecture/proguard-rules.pro
+++ b/architecture/proguard-rules.pro
@@ -19,3 +19,4 @@
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
 #-renamesourcefileattribute SourceFile
+-keep class org.mozilla.fenix.mvi.** { *; }