diff --git a/Android.mk b/Android.mk
index 152274240c..dc72ec6dbc 100644
--- a/Android.mk
+++ b/Android.mk
@@ -28,7 +28,6 @@ LOCAL_CERTIFICATE := shared
 
 LOCAL_OVERRIDES_PACKAGES := Home
 
-LOCAL_PROGUARD_ENABLED := disabled
 LOCAL_PROGUARD_FLAGS := -include $(LOCAL_PATH)/proguard.flags
 
 include $(BUILD_PACKAGE)
diff --git a/proguard.flags b/proguard.flags
index fb145aa31e..5d72ef32b9 100644
--- a/proguard.flags
+++ b/proguard.flags
@@ -3,4 +3,6 @@
   public void nextScreen(android.view.View);
 }
 
--keep class com.android.launcher2.AllApps3D.Defines
+-keep class com.android.launcher2.AllApps3D$Defines {
+  *;
+}