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

diff --git a/proguard.flags b/proguard.flags
index 8d60103bc..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();
@@ -55,3 +50,39 @@
 # Required for mp4parser
 -keep public class * implements com.coremedia.iso.boxes.Box
 
+#-assumenosideeffects junit.framework.Assert {
+#*;
+#}
+
+# For unit testing:
+
+# - Required for running exif tests on userdebug
+-keep class com.android.gallery3d.exif.ExifTag { *; }
+-keep class com.android.gallery3d.exif.ExifData { *; }
+-keep class com.android.gallery3d.exif.ExifInterface { *; }
+-keepclassmembers class com.android.gallery3d.exif.Util {
+  *** closeSilently(...);
+}
+
+# - Required for running blobcache tests on userdebug
+-keep class com.android.gallery3d.common.BlobCache { *; }
+
+# - Required for running glcanvas tests on userdebug
+-keep class com.android.gallery3d.ui.GLPaint { *; }
+-keep class com.android.gallery3d.ui.GLCanvas { *; }
+-keep class com.android.gallery3d.glrenderer.GLPaint { *; }
+-keep class com.android.gallery3d.glrenderer.GLCanvas { *; }
+-keep class com.android.gallery3d.ui.GLView { *; }
+-keepclassmembers class com.android.gallery3d.util.IntArray {
+  *** 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*