diff --git a/xwords4/android/app/build.gradle b/xwords4/android/app/build.gradle
index 6e28428b2..6abbc7120 100644
--- a/xwords4/android/app/build.gradle
+++ b/xwords4/android/app/build.gradle
@@ -118,10 +118,13 @@ android {
         release {
             debuggable false
             minifyEnabled false // PENDING
+            // proguard-android-optimize.txt doesn't work right now! Causes dex to fail
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
         debug {
             debuggable true
+            minifyEnabled true // for testing
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
             // This doesn't work on marshmallow: duplicate permission error
             // applicationIdSuffix ".debug"
         }
diff --git a/xwords4/android/proguard-rules.pro b/xwords4/android/app/proguard-rules.pro
similarity index 72%
rename from xwords4/android/proguard-rules.pro
rename to xwords4/android/app/proguard-rules.pro
index 9f4fe14b6..68422dad0 100644
--- a/xwords4/android/proguard-rules.pro
+++ b/xwords4/android/app/proguard-rules.pro
@@ -32,3 +32,11 @@
 
 # Prevents crash when jni code calls setInt on various jin.* classes
 -keep public class org.eehouse.android.xw4.jni.** { public *; }
+
+-keep public class org.eehouse.android.xw4.NetLaunchInfo
+-keep public class org.eehouse.android.xw4.SelectableItem
+-keep public class org.eehouse.android.xw4.XWListItem.* { public *; }
+-keep public class org.eehouse.android.xw4.BoardDelegate
+-keep public class org.eehouse.android.xw4.HeaderWithExpander$OnExpandedListener
+-keep public class org.eehouse.android.xw4.XWListItem$ExpandedListener
+-keep public class org.eehouse.android.xw4.XWListItem$DeleteCallback