X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=proguard.flags;h=c8ba2ffada8d23b2c3e28bd2fef47cb765513f25;hb=ce684cfa6c284b94e93897ce42ae7529ed02e335;hp=8cb04867da0de78a0006bb14d2da6f66edc345fa;hpb=c6a12b24b4662ba9fa7cc8c7d072ecb0a8f79e46;p=android-x86%2Fpackages-apps-Gallery2.git

diff --git a/proguard.flags b/proguard.flags
index 8cb04867d..c8ba2ffad 100644
--- a/proguard.flags
+++ b/proguard.flags
@@ -14,11 +14,6 @@
   <init>(...);
 }
 
--keep class com.android.camera.ActivityBase {
-  public int getResultCode();
-  public android.content.Intent getResultData();
-}
-
 -keep class com.android.camera.CameraActivity {
   public boolean isRecording();
   public long getAutoFocusTime();
@@ -45,8 +40,6 @@
 # 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.** { *; }
@@ -84,3 +77,12 @@
   *** toArray(...);
 }
 -keep class com.android.gallery3d.util.ProfileData { *; }
+
+# - Required for running jpeg stream tests on userdebug
+-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*