Merge "Fix ProGuard error."

[android-x86/packages-apps-Gallery2.git] / proguard.flags

diff --git a/proguard.flags b/proguard.flags
index 53693c1..ae83baa 100644 (file)
--- a/proguard.flags
+++ b/proguard.flags
@@ -40,6 +40,8 @@
 # Disable the warnings of using dynamic method calls in EffectsRecorder
 -dontnote com.android.camera.EffectsRecorder
 
+-keep class android.support.v8.renderscript.** { *; }
+
 # Required for ActionBarSherlock
 -keep class android.support.v4.app.** { *; }
 -keep interface android.support.v4.app.** { *; }
@@ -82,3 +84,7 @@
 -keep class com.android.gallery3d.jpegstream.JPEGOutputStream { *; }
 -keep class com.android.gallery3d.jpegstream.JPEGInputStream { *; }
 -keep class com.android.gallery3d.jpegstream.StreamUtils { *; }
+
+
+# TODO: remove or rename android.util.Pools.java from our source.
+-dontwarn android.util.Pools*